Merge branch 'v1.9.0-jm' of http://192.168.0.115:3000/bill/fuse-code into v1.9.0-jm

src/sdk/association/fuseMode.ts

@@ -48,7 +48,7 @@ const setModels = (sdk: SDK, models: FuseModels, oldModels: FuseModels) => {
     if (getSceneModel(item)) {
       continue;
     }
-
+    console.error('addMode', item.status)
     if (item.status !== SceneStatus.SUCCESS) {
       item.error = true;
       item.loaded = true;
@@ -58,6 +58,7 @@ const setModels = (sdk: SDK, models: FuseModels, oldModels: FuseModels) => {
     const itemRaw = toRaw(item);
     let sceneModel: SceneModel;
     try {
+      
       sceneModel = sdk.addModel({
         ...itemRaw,
         ...modelRange,

src/views/fire/index.vue

@@ -39,13 +39,16 @@ const tmLabelMap1 = {
   projectSite: "案件类别",
   organizerDeptName: "案发时间",
   projectName: ["是否命案", (v: any) => (v === undefined ? "" : v ? "是" : "否")],
-  organizerUsers: ["是否刑案", (v: any) => {
-    console.error(v)
-    return v === undefined ? "" : v ? "是" : "否"
-  }],
+  organizerUsers: [
+    "是否刑案",
+    (v: any) => {
+      console.error(v);
+      return v === undefined ? "" : v ? "是" : "否";
+    },
+  ],
   accidentDate: "案发区域",
   fireReason: "案发地点",
-  statusDesc: "经纬度",
+  statusDesc: ["经纬度", (v: any) => (v ? v.split(",").reverse().join(",") : "")],
 } as LabelMap;
 
 const tmLabelMap2 = {

src/views/folder/fire/index.vue

@@ -51,7 +51,7 @@ const tmLabelMap1 = {
   ],
   caseRegion: ["案发区域", (v: string[]) => v.join("-")],
   caseAddress: "案发地点",
-  latAndLong: "经纬度",
+  latAndLong: ["经纬度", (v: any) => (v ? v.split(",").reverse().join(",") : "")],
 } as LabelMap;
 
 const tmLabelMap2 = {