tangning пре 1 дан
родитељ
комит
1a22c9612b
2 измењених фајлова са 16 додато и 11 уклоњено
  1. 4 6
      src/view/material/tableScene/pagging.ts
  2. 12 5
      src/view/material/tableScene/sceneContent.vue

+ 4 - 6
src/view/material/tableScene/pagging.ts

@@ -36,13 +36,11 @@ export const useScenePaggingParams = (caseId: string) => {
     },
     },
   });
   });
 
 
-  let oldSnCode = pagging.state.query.snCode;
   watchEffect(() => {
   watchEffect(() => {
-    if (isSwmx.value) {
-      oldSnCode = pagging.state.query.snCode;
-      pagging.state.query.snCode = "";
-    } else {
-      pagging.state.query.snCode = oldSnCode;
+    if (keyword.value) {
+      pagging.state.table.rows = pagging.state.table.rows.filter((row) =>{
+        return row?.title.includes(keyword.value);
+      })
     }
     }
   });
   });
 
 

+ 12 - 5
src/view/material/tableScene/sceneContent.vue

@@ -39,7 +39,7 @@ import { router } from "@/router";
 import { useScenePaggingParams, ScenePagging } from "./pagging";
 import { useScenePaggingParams, ScenePagging } from "./pagging";
 import { QuiskExpose } from "@/helper/mount";
 import { QuiskExpose } from "@/helper/mount";
 import { onMounted, ref, watch, watchEffect, computed, nextTick } from "vue";
 import { onMounted, ref, watch, watchEffect, computed, nextTick } from "vue";
-import { ElMessage } from "element-plus";
+import { ElMessage, ElMessageBox } from "element-plus";
 // const params = useScenePaggingParams();
 // const params = useScenePaggingParams();
 const props = defineProps<{ pagging: ScenePagging, num: Array<string>, noEditList: Array<string> }>();
 const props = defineProps<{ pagging: ScenePagging, num: Array<string>, noEditList: Array<string> }>();
 const caseId = computed(() => (router.currentRoute.value?.params?.caseId));
 const caseId = computed(() => (router.currentRoute.value?.params?.caseId));
@@ -58,12 +58,14 @@ const submit = async () => {
   let { data } = await checkNumImage({num: num.value, caseId: caseId.value})
   let { data } = await checkNumImage({num: num.value, caseId: caseId.value})
   console.log("checkNumImage", data);
   console.log("checkNumImage", data);
   if(!data.isEntryDoor){
   if(!data.isEntryDoor){
-    ElMessage.error(`当前实景三维未识别到入户门或未添加痕迹物证。
+    ElMessageBox.confirm(
+      `当前实景三维未识别到入户门或未添加痕迹物证。
 AI制卷需要计算入户门与痕迹物证之间的路线。
 AI制卷需要计算入户门与痕迹物证之间的路线。
 请先前往实景三维,使用画笔功能标注入户门所在区域,
 请先前往实景三维,使用画笔功能标注入户门所在区域,
-或添加痕迹物证热点。`);
+或添加痕迹物证热点。`,
+      "提示",{confirmButtonText: '我知道了'}
+    )
     throw "未识别到入户门";
     throw "未识别到入户门";
-    return; 
   }
   }
   return num.value
   return num.value
   }
   }
@@ -93,7 +95,12 @@ watchEffect(() => {
 const handleSelect = (selection, row) => {
 const handleSelect = (selection, row) => {
   if (!tableRef.value) return;
   if (!tableRef.value) return;
   tableRef.value.clearSelection()
   tableRef.value.clearSelection()
-  tableRef.value.toggleRowSelection(row, true)
+  if(num.value == row.num){
+    num.value = null;
+    return;
+  }else{
+    tableRef.value.toggleRowSelection(row, true)
+  }
 }
 }
 const changeSelection = async (selectScenes) => {
 const changeSelection = async (selectScenes) => {
   console.log("selectScenes", num.value, selectScenes);
   console.log("selectScenes", num.value, selectScenes);