1

src/views/productOperation/cameraScene.vue

@@ -40,7 +40,7 @@
               },
               {
                 label: '权限',
-                disabled: (!(record.status == 1 || record.status == -2)) || !record.isAuth,
+                disabled: !(record.status == 1 || record.status == -2) || !record.isAuth,
                 ifShow: getTypeCheckPerm('scenes-powers'),
                 onClick: handlePowers.bind(null, record),
               },
@@ -48,7 +48,11 @@
                 label: '迁移',
                 disabled: !(record.status == 1 || record.status == -2),
                 ifShow:
-                  getTypeCheckPerm('scenes-move') && tableType != 3 && (record.userName == userInfo.userName || userInfo.roleId == 1 || userInfo.roleId == 45),
+                  getTypeCheckPerm('scenes-move') &&
+                  tableType != 3 &&
+                  (record.userName == userInfo.userName ||
+                    userInfo.roleId == 1 ||
+                    userInfo.roleId == 45),
                 onClick: handleMove.bind(null, record),
               },
               {
@@ -56,7 +60,9 @@
                 ifShow:
                   getTypeCheckPerm('scenes-download') &&
                   tableType != 3 &&
-                  (record.userName == userInfo.userName || userInfo.roleId == 1 || userInfo.roleId == 45),
+                  (record.userName == userInfo.userName ||
+                    userInfo.roleId == 1 ||
+                    userInfo.roleId == 45),
                 disabled: !(record.status == 1 || (record.status == -2 && record.payStatus == 1)),
                 //icon: 'carbon:download',
                 onClick: handleDownload.bind(null, record),
@@ -77,7 +83,11 @@
                 label: '复制',
                 disabled: !(record.status == 1 || (record.status == -2 && record.payStatus == 1)),
                 ifShow:
-                  getTypeCheckPerm('scenes-copy') && tableType != 3 && (record.userName == userInfo.userName || userInfo.roleId == 1 || userInfo.roleId == 45),
+                  getTypeCheckPerm('scenes-copy') &&
+                  tableType != 3 &&
+                  (record.userName == userInfo.userName ||
+                    userInfo.roleId == 1 ||
+                    userInfo.roleId == 45),
                 onClick: handleCopy.bind(null, record),
               },
               {
@@ -86,14 +96,20 @@
                   getTypeCheckPerm('scenes-creatobj') &&
                   record.status == -2 &&
                   (tableType == 2 || tableType == 6) &&
-                  (record.userName == userInfo.userName || userInfo.roleId == 1 || userInfo.roleId == 45),
+                  (record.userName == userInfo.userName ||
+                    userInfo.roleId == 1 ||
+                    userInfo.roleId == 45),
                 onClick: handleGenerate.bind(null, record),
               },
               {
                 label: '删除',
                 //icon: 'ic:outline-delete-outline',
                 color: 'error',
-                ifShow: getTypeCheckPerm('scenes-delete') && (record.userName == userInfo.userName || userInfo.roleId == 1 || userInfo.roleId == 45),
+                ifShow:
+                  getTypeCheckPerm('scenes-delete') &&
+                  (record.userName == userInfo.userName ||
+                    userInfo.roleId == 1 ||
+                    userInfo.roleId == 45),
                 disabled: record.status == 0,
                 //onClick: handleDelete.bind(null, record),
                 popConfirm: {
@@ -432,11 +448,12 @@
       function handleDownload(record: Recordable) {
         console.log('handleDownload', record, canDownload.value);
         canDownload.value = true;
-        checkDownLoad({ num: record.num }).then((res) => {
+        let isObj = ( tableType.value == 5 || tableType.value == 7 ) ? 1 : 0;
+        checkDownLoad({ num: record.num, isObj }).then((res) => {
           console.log(res);
           if (res.downloadStatus != 3) {
             // 未下载过，需要打包
-            sceneDownload({ num: record.num }).then((res) => {
+            sceneDownload({ num: record.num, isObj }).then((res) => {
               console.log(res);
               openDownModal(true, {
                 ...record,