tangning hace 1 año
padre
commit
69e6936f8e
Se han modificado 2 ficheros con 13 adiciones y 3 borrados
  1. 1 1
      src/views/device/index.vue
  2. 12 2
      src/views/productOperation/cameraScene.vue

+ 1 - 1
src/views/device/index.vue

@@ -23,7 +23,7 @@
               },
               {
                 label: '编辑',
-                //ifShow: getCheckPerm('device-update') && Boolean(record.outType),
+                ifShow: getCheckPerm('device-update'),
                 onClick: handleEdit.bind(null, record),
               },
               {

+ 12 - 2
src/views/productOperation/cameraScene.vue

@@ -18,7 +18,13 @@
         :rowSelection="tableType == 3 ? false : rowSelection"
       >
         <template #toolbar>
-          <a-button type="primary" @click="handleMoveAll" v-if="tableType != 3 && getCheckPerm('scenes-move-batch')"> 批量迁移</a-button>
+          <a-button
+            type="primary"
+            @click="handleMoveAll"
+            v-if="tableType != 3 && getCheckPerm('scenes-move-batch')"
+          >
+            批量迁移</a-button
+          >
         </template>
         <template #status="{ record }">
           <span v-if="record.status != '-1'">{{ record.statusString }}</span>
@@ -353,7 +359,11 @@
             });
           } else {
             canDownload.value = false;
-            window.open(res.downloadUrl);
+            if (tableType.value == 2 || tableType.value == 6) {
+              window.open('/' + res.downloadUrl);
+            } else {
+              window.open(res.downloadUrl);
+            }
           }
         });
       }