bill 7 bulan lalu
induk
melakukan
78d95d115f

+ 1 - 1
src/api/folder-type.ts

@@ -18,7 +18,7 @@ export const fetchFloderTypes = async () => {
     filesTypeName: "照片制卷",
     flatShow: false,
     modalShow: false,
-    parentId: 2,
+    parentId: 39,
   });
   return types;
 };

+ 10 - 8
src/layout/scene-list/index.vue

@@ -27,7 +27,7 @@
         class="scene"
         :class="{ disabled: item.raw.status !== SceneStatus.SUCCESS }"
         @click="updateCurrent(item.raw)"
-        v-else
+        v-else-if="item.raw.type !== SceneType.SWMX"
       >
         <div>
           <p>{{ item.raw.name }}</p>
@@ -91,13 +91,15 @@ const sync = async (scene: Scene) => {
 
 const list = computed(() => {
   const sceneList = true
-    ? scenes.value.map((scene) => ({
-        raw: scene,
-        select:
-          props.current !== fuseModel &&
-          props.current.num === scene.num &&
-          props.current.type === scene.type,
-      }))
+    ? scenes.value
+        .filter((scene) => scene.type !== SceneType.SWMX)
+        .map((scene) => ({
+          raw: scene,
+          select:
+            props.current !== fuseModel &&
+            props.current.num === scene.num &&
+            props.current.type === scene.type,
+        }))
     : [];
   if (fuseModels.value.length) {
     return [{ raw: fuseModel }, ...sceneList];

+ 5 - 2
src/views/fire/index.vue

@@ -38,8 +38,11 @@ const tmLabelMap1 = {
   projectAddress: "立案编号",
   projectSite: "案件类别",
   organizerDeptName: "案发时间",
-  projectName: ["是否命案", (v: any) => (v ? "是" : "否")],
-  organizerUsers: ["是否刑件", (v: any) => (v ? "是" : "否")],
+  projectName: ["是否命案", (v: any) => (v === undefined ? "" : v ? "是" : "否")],
+  organizerUsers: ["是否刑案", (v: any) => {
+    console.error(v)
+    return v === undefined ? "" : v ? "是" : "否"
+  }],
   accidentDate: "案发区域",
   fireReason: "案发地点",
   statusDesc: "经纬度",

+ 8 - 2
src/views/folder/fire/index.vue

@@ -41,8 +41,14 @@ const tmLabelMap1 = {
   caseNum: "立案编号",
   caseCategory: "案件类别",
   crimeTime: "案发时间",
-  homicideCase: ["是否命案", (v: any) => (v ? "是" : "否")],
-  criminalCase: ["是否刑件", (v: any) => (v ? "是" : "否")],
+  homicideCase: ["是否命案", (v: any) => (v === null ? "" : v ? "是" : "否")],
+  criminalCase: [
+    "是否刑案",
+    (v: any) => {
+      console.error(v);
+      return v === null ? "" : v ? "是" : "否";
+    },
+  ],
   caseRegion: ["案发区域", (v: string[]) => v.join("-")],
   caseAddress: "案发地点",
   latAndLong: "经纬度",