Преглед на файлове

feat(组件): 修改bug

tangning преди 2 години
родител
ревизия
25cb814d60

+ 1 - 1
src/views/productOperation/viewKankan.vue

@@ -112,7 +112,7 @@
           dataIndex: 'status',
           width: 80,
           customRender: ({ record }) => {
-            return record.isCopy ? '是' : '否';
+            return record.isPassword == 1 ? '是' : '否';
           },
         },
         {

+ 2 - 2
src/views/statistics/components/activelineEchart.vue

@@ -93,7 +93,7 @@
         'num':viewStaticsData.value && viewStaticsData.value[index] || 0,
       }
     })
-    exportElsxFile(data, fields,'用户趋势')
+    exportElsxFile(data, fields,'用户活跃度')
 }
   async function getAddUser() {
     let xdata = [], yData=[]
@@ -138,7 +138,7 @@
           type: 'line',
           itemStyle: { color: '#38a0ff' },
           // barMaxWidth: 80,
-          name: '用户趋势',
+          name: '用户活跃度',
         },
         // {
         //   data: shareStaticsData.value,

+ 4 - 4
src/views/statistics/components/condition.vue

@@ -12,7 +12,7 @@
     </div>
 
     <div class="selct" style="display: inline-block; margin-right: 15px">
-      <RangePicker v-model:value="selectTime"  format="YYYY-MM-DD" @change="handleTime"/>
+      <RangePicker v-model:value="selectTime" valueFormat="YYYY-MM-DD" format="YYYY-MM-DD" @change="handleTime"/>
     </div>
 
     <div class="selct" style="display: inline-block">
@@ -46,7 +46,7 @@ const props = defineProps({
 type RangeValue = [Dayjs, Dayjs];
 const picker = ref('date');
 const value = ref(props.type ||'0');
-const selectTime = ref<RangeValue>();
+const selectTime = ref<RangeValue>([dayjs().subtract(6,'month').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')]);
 const options = ref<SelectProps['options']>([
   {
     value: '0',
@@ -92,8 +92,8 @@ function but(){
 }
 function output(){
   let data = {
-    startTime:selectTime.value?.length&&dayjs(selectTime.value[0]).format('YYYY-MM-DD')||'',
-    endTime:selectTime.value?.length&&dayjs(selectTime.value[1]).format('YYYY-MM-DD')||'',
+    startTime:selectTime.value[0],
+    endTime:selectTime.value[1],
     dataType:value.value,
     type:type.value,
   }

+ 2 - 2
src/views/statistics/order/index.vue

@@ -46,8 +46,8 @@
     console.log('params',val)
     SearchData.startTime = startTime
     SearchData.endTime = endTime
-    SearchData.dataType = dataType
-    SearchData.type = type
+    SearchData.dataType = type
+    SearchData.type = dataType
     getList()
   }
   async function getData() {