Просмотр исходного кода

fix: 修改bug 项目中心案件编辑器

tangning 1 день назад
Родитель
Сommit
43bf441f84

+ 1 - 1
src/view/camera/index.vue

@@ -102,7 +102,7 @@ const changeCameraHandler = async (camera: Camera) => {
 const del = async (camera: Camera) => {
   if (
     await confirm(
-      "解绑相机,该相机拍摄的场景也将一并解绑,包括已添加到多元融合或项目场景也会移除。 (场景在云端存储,不删除)确定要解绑吗?"
+      "解绑相机,该相机拍摄的场景也将一并解绑,包括已添加到多元融合或项目场景也会移除。 (场景在云端存储,不删除)确定要解绑吗?"
     )
   ) {
     await delCamera(camera);

+ 3 - 3
src/view/mediaLibrary/index.vue

@@ -74,10 +74,10 @@
         </template>
       </el-table-column>
       <el-table-column label="操作" width="240px" v-slot:default="{ row }">
-        <span class="oper-span" :class="{ disable: row.status == 1 }" v-if="row.useType != 'animation'" @click="downloadMediaHandler(row)" v-pdpath="'view'">下载</span>
-        <span class="oper-span" :class="{ disable: row.status == 1 }" v-if="row.useType != 'animation'" @click="downloadHashHandler(row)" v-pdpath="'view'">hash</span>
+        <span class="oper-span" :class="{ disable: row.status != 1 }" v-if="row.useType != 'animation'" @click="downloadMediaHandler(row)" v-pdpath="'view'">下载</span>
+        <span class="oper-span" :class="{ disable: row.status != 1 }" v-if="row.useType != 'animation'" @click="downloadHashHandler(row)" v-pdpath="'view'">hash</span>
         <span class="oper-span" :class="{ disable: row.status == 0 }" v-if="row.useType != 'animation'" @click="editMediaHandler(row)" v-pdpath="'view'">编辑</span>
-        <span class="oper-span delBtn delete-oper" :class="{ disable: row.status === 1 }" v-if="row.useType != 'animation'" @click="confirmDelete(row)" v-pdpath="'view'"> 删除 </span>
+        <span class="oper-span delBtn delete-oper" :class="{ disable: row.status === 0 }" v-if="row.useType != 'animation'" @click="confirmDelete(row)" v-pdpath="'view'"> 删除 </span>
       </el-table-column>
     </el-table>
 

+ 1 - 1
src/view/newFireCase/newFireDetails/components/headerTop.vue

@@ -24,7 +24,7 @@
         type="primary"
         class="preview-btn"
         v-if="typeName === '提取清单' || typeName === '勘验笔录'"
-        @click="emit('export')"
+        @click="throttle(emit('export'), 500)"
       >导出</el-button>
     </div>
   </div>

+ 6 - 2
src/view/newFireCase/newFireDetails/components/scene.vue

@@ -101,6 +101,7 @@
         height="420"
         style="width: 100%"
         :row-class-name="rowClassName"
+        :row-key="rowKey"
         @selection-change="onSelectionChange"
         @select="ItemChange"
         @select-all="listChange"
@@ -186,7 +187,7 @@ watch(activeId, (newVal, oldVal) => {
       if (isOfflineMode()) {
         let filename = [0, 1, 3, 4, 6].includes(Number(scene.sceneType)) ? 'swkk' : 'swss';
         let HtmlName = [0, 1, 3, 4, 6].includes(Number(scene.sceneType)) ? 'spg.html' : 'offline.html';
-        activeWebSite.value = `./${filename}/${scene.num}/www/${HtmlName}?m=${scene.num}`
+        activeWebSite.value = `./${filename}/${scene.num}/wwwroot/${HtmlName}?m=${scene.num}`
       } else {
         activeWebSite.value = scene.webSite || '';
       }
@@ -376,6 +377,8 @@ const listChange = (selection) =>  {
   }
 };
 const onSelectionChange = (rows: Scene[]) => {
+  console.log(rows, 'rows', selectedRows.value)
+
   // 保证“已导入”的行始终在选中集合中,并与跨页选中合并
   const map = new Map<string, any>();
   // 先放入全局已选中的集合(跨页保持)
@@ -413,7 +416,8 @@ const onConfirmEdit = async () => {
     // 组装 {type, numList},包含当前已有的场景
     const mergedList = mergeScenesWithSelection();
     const numList = mergedList.map((s: any) => s.num);
-    const oldScene = scenes.value.filter(ele => !numList.includes(ele.num)).map(element => { return { ...element, num: element.num, type: element.sceneType } });
+    const oldScene = scenes.value.map(element => { return { ...element, num: element.num, type: element.sceneType } });
+    console.log(oldScene, 'oldScene', mergedList, scenes.value)
     const payload = getCaseScenes([...mergedList, ...oldScene] as any[]);
     await replaceCaseScenes(caseId.value, payload);
     // 刷新案件场景列表