Browse Source

feat: 修改bug

tangning 2 years ago
parent
commit
69708347e1

+ 6 - 6
src/views/productOperation/cameraScene.vue

@@ -18,7 +18,8 @@
           <span v-if="record.status != '-1'">{{record.statusString}}</span>
           <Tooltip v-else placement="right">
             <template #title>
-              <span>{{record.buildErrorReason}}</span>
+              <span>失败原因:{{record.buildErrorReason}}</span>
+              <p>server-path:{{record.dataSource}}</p>
             </template>
           <span>{{record.statusString}}
             <Icon icon="mdi:warning-octagon-outline" />
@@ -480,15 +481,14 @@
       const downloadOption = ref<Object>({});
       const canDownload = ref<boolean>(true);
       function handleDownload(record: Recordable) {
-        console.log('handleDownload', record,canDownload.value);
-        let isObj = tableType.value == 4?1:0
-        let params = {num: record.num}
-        if(tableType.value == 4 || tableType.value == 2){
+        console.log('handleDownload', record,tableType.value);
+        let isObj = tableType.value == 5?1:0
+        let params = {num: record.num,isObj:0,}
+        if(tableType.value == 4 || tableType.value == 5){
           params.isObj = isObj
         }
         canDownload.value = true;
         checkDownLoad(params).then((res) => {
-          console.log(res);
           if (res.downloadStatus != 3) {
             // 未下载过,需要打包
             sceneDownload(params).then((res) => {

+ 6 - 2
src/views/statistics/components/condition.vue

@@ -49,6 +49,7 @@ type RangeValue = [Dayjs, Dayjs];
 const picker = ref('date');
 const type = ref(props.timeType ||'0');
 const value = ref(props.type ||'0');
+const isUserDate =ref(false);
 const selectPriceDate = ref(dayjs().subtract(6,'month').format('YYYY-MM-DD'))
 const selectTime = ref<RangeValue>([dayjs().subtract(props.selectTimeType == 1 ? 1:6,'month').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')]);
 const options = ref<SelectProps['options']>([
@@ -86,18 +87,21 @@ function calendarPriceRangeChange(date){
   selectPriceDate.value = date[0]
 }
 function handleData(val) {
-  console.log('handleData',val)
   value.value = val
+  if(!isUserDate.value){
+    selectTime.value = [dayjs().subtract(value.value == '0' ? 1:6,'month').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')];
+  }
   output()
 }
+
 function handleType(val) {
   type.value = val
   output()
 }
 
 function handleTime(val) {
-  console.log('selectTime',val)
   selectTime.value = val
+  isUserDate.value = true
   output()
 }
 function but(){