tangning 6 月之前
父节点
当前提交
4352b5fa29

+ 3 - 3
src/views/account/product/index.vue

@@ -462,16 +462,16 @@
           params.isObj = 1;
           params.isObj = 1;
         }
         }
         checkDownLoad(params).then(async (res) => {
         checkDownLoad(params).then(async (res) => {
-          console.log(res);
+          let sceneDownloadRes = res;
           if (res.downloadStatus != 3) {
           if (res.downloadStatus != 3) {
             // 未下载过,需要打包
             // 未下载过,需要打包
             if (res.downloadStatus != 1) {
             if (res.downloadStatus != 1) {
-              await sceneDownload(params);
+              sceneDownloadRes = await sceneDownload(params);
             }
             }
             openDownModal(true, {
             openDownModal(true, {
               ...record,
               ...record,
             });
             });
-            if (res.downloadStatus == 1) {
+            if (sceneDownloadRes.downloadStatus == 1) {
               if (timer.value) {
               if (timer.value) {
                 afterClose();
                 afterClose();
               }
               }

+ 3 - 3
src/views/customer/scene.vue

@@ -337,16 +337,16 @@
           params.isObj = isObj
           params.isObj = isObj
         }
         }
         checkDownLoad(params).then(async (res) => {
         checkDownLoad(params).then(async (res) => {
-          console.log(res);
+          let sceneDownloadRes = res;
           if (res.downloadStatus != 3) {
           if (res.downloadStatus != 3) {
             // 未下载过,需要打包
             // 未下载过,需要打包
             if (res.downloadStatus != 1) {
             if (res.downloadStatus != 1) {
-              await sceneDownload(params);
+              sceneDownloadRes = await sceneDownload(params);
             }
             }
             openDownModal(true, {
             openDownModal(true, {
               ...record,
               ...record,
             });
             });
-            if (res.downloadStatus == 1) {
+            if (sceneDownloadRes.downloadStatus == 1) {
               if (timer.value) {
               if (timer.value) {
                 afterClose();
                 afterClose();
               }
               }

+ 4 - 2
src/views/order/data.ts

@@ -703,9 +703,11 @@ export const differenceColumns: BasicColumn[] = [
     ellipsis: true,
     ellipsis: true,
     dataIndex: 'validDay',
     dataIndex: 'validDay',
     customRender: ({ record }) => {
     customRender: ({ record }) => {
-      return record.validDay || '-';
+      return record.validEndTime && record.validEndTime
+        ? `${record.validStartTime}~${record.validEndTime}`
+        : '-';
     },
     },
-    width: 160,
+    width: 200,
   },
   },
   {
   {
     title: '项目号',
     title: '项目号',

+ 5 - 4
src/views/productOperation/cameraScene.vue

@@ -343,22 +343,23 @@
         }
         }
         canDownload.value = true;
         canDownload.value = true;
         checkDownLoad(params).then(async (res) => {
         checkDownLoad(params).then(async (res) => {
-          console.log(res);
+          let sceneDownloadRes = res;
           if (res.downloadStatus != 3) {
           if (res.downloadStatus != 3) {
             // 未下载过,需要打包
             // 未下载过,需要打包
             if (res.downloadStatus != 1) {
             if (res.downloadStatus != 1) {
-              await sceneDownload(params);
+              sceneDownloadRes = await sceneDownload(params);
             }
             }
             openDownModal(true, {
             openDownModal(true, {
               ...record,
               ...record,
             });
             });
-            if (res.downloadStatus == 1) {
+            if (sceneDownloadRes.downloadStatus == 1) {
               if (timer.value) {
               if (timer.value) {
                 afterClose();
                 afterClose();
               }
               }
               timer.value = setInterval(() => {
               timer.value = setInterval(() => {
                 downloadProcess(params).then((processres) => {
                 downloadProcess(params).then((processres) => {
-                  console.log('processres', res);
+                  console.log('processres', res, params);
+                  debugger
                   if (processres.percent >= 100) {
                   if (processres.percent >= 100) {
                     canDownload.value = false;
                     canDownload.value = false;
                     afterClose();
                     afterClose();

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

@@ -360,16 +360,16 @@
         }
         }
         canDownload.value = true;
         canDownload.value = true;
         checkDownLoad(params).then(async (res) => {
         checkDownLoad(params).then(async (res) => {
-          console.log(res);
+          let sceneDownloadRes = res;
           if (res.downloadStatus != 3) {
           if (res.downloadStatus != 3) {
             // 未下载过,需要打包
             // 未下载过,需要打包
             if (res.downloadStatus != 1) {
             if (res.downloadStatus != 1) {
-              await sceneDownload(params);
+              sceneDownloadRes = await sceneDownload(params);
             }
             }
             openDownModal(true, {
             openDownModal(true, {
               ...record,
               ...record,
             });
             });
-            if (res.downloadStatus == 1) {
+            if (sceneDownloadRes.downloadStatus == 1) {
               if (timer.value) {
               if (timer.value) {
                 afterClose();
                 afterClose();
               }
               }