bill 1 ヶ月 前
コミット
1a2bf4077d

+ 7 - 5
src/example/fuse/enter-shared.ts

@@ -163,6 +163,7 @@ export const getSceneList = (keyword: string) => {
       isMesh: 1,
       caseId: params.value.caseId,
       overviewId: params.value.overviewId,
+      num: params.value.m,
       pageNum: page,
       sceneName: keyword,
     });
@@ -173,7 +174,7 @@ export const getSceneList = (keyword: string) => {
           m: item.num,
           title: item.sceneName,
           id: item.id.toString(),
-          mapping: item.mapping,
+          mapping: item.mapping || '',
           token,
         } as Scene)
     );
@@ -355,26 +356,27 @@ export let getTableTemp = async () => {
       绘图时间: "",
     };
 
-    if (params.value.overviewId) {
+    if (window.platform.num) {
       const item = await get("fusion/caseOverview/settingInfo", {
-        overviewId: params.value.overviewId,
+        num: window.platform.num,
       });
       if (item) {
         table.案发时间 = item.crimeTimeBegin;
         table.案发地点 = item.caseLocation;
         table.绘图单位 = item.orgName;
         table.绘图人 = item.investigatorName;
-        table.绘图时间 = formatDate(new Date(), "yyyy.mm.dd hh:MM:ss");
+        table.绘图时间 = formatDate(new Date(), "yyyy.MM.dd hh:mm");
         if (!title) {
           title = `“${item.crimeTimeBegin}”${item.caseLocation}${item.caseTypeName}现场平面示意图`;
         }
+        return (tempCache = { table, title });
       }
     }
   }
   if (!title) {
     title = "默认标题";
   }
-  return (tempCache = { table, title });
+  return { table, title };
 };
 
 export const getTileGroups = async () => {

+ 13 - 4
src/example/fuse/enter.ts

@@ -55,10 +55,16 @@ const sceneDrawInit = async () => {
   await sceneTransform(m, subgroup);
 
   const data = await platform.getOverviewData(params.value.overviewId);
-  m = data.num;
-  subgroup = data.subGroup;
+  if (data.num) {
+    m = data.num;
+  }
+  if (data.subGroup) {
+    subgroup = data.subGroup;
+  }
 
   window.platform.sceneDraw = !!m;
+  window.platform.num = m;
+  window.platform.subgroup = subgroup;
   if (window.platform.sceneDraw) {
     window.platform.saveOverviewData = async (id: any, data: any) => {
       const result = await platform.saveOverviewData(id, {
@@ -68,7 +74,7 @@ const sceneDrawInit = async () => {
       });
       console.log("更新平面图");
       const key = `${m}-${subgroup}-draw-kankan-cover`;
-      localStorage.setItem(key, Date.now().toString());
+      localStorage.setItem(key, data.kankanCover + "?" + Date.now().toString());
       return result;
     };
   }
@@ -78,7 +84,10 @@ const sceneDrawInit = async () => {
 };
 
 if (!!params.value.sceneDraw) {
-  sceneDrawInit();
+  sceneDrawInit().catch(() => {
+    /* @vite-ignore */
+    import(import.meta.env.VITE_ENTRY_EXAMPLE);
+  });
 } else {
   /* @vite-ignore */
   import(import.meta.env.VITE_ENTRY_EXAMPLE);

+ 4 - 4
src/example/platform/resource-swkk.ts

@@ -140,7 +140,7 @@ export const getCoverLine = async (
     reqs.push(
       getSceneApi(
         "oss",
-        `/scene_view_data/${scene.m}/data/floorplan/floor_${floor.subgroup}.png`
+        `${scene.mapping ? '/' + scene.mapping : ''}/scene_view_data/${scene.m}/data/floorplan/floor_${floor.subgroup}.png`
       )
         .then((url) => (item.thumb = url))
         .catch(() => {})
@@ -166,7 +166,7 @@ export const getHotTaggingInfos = async (scene: Scene, scale: number) => {
   for (const hot of hots) {
     if (!validNum(hot.position.x) || !validNum(hot.position.y)) continue;
     reqs.push(
-      getSceneApi("oss", `/scene_view_data/${scene.m}/user/${hot.icon}`)
+      getSceneApi("oss", `${scene.mapping ? '/' + scene.mapping : ''}/scene_view_data/${scene.m}/user/${hot.icon}`)
         .then((url) =>
           infos.push({
             position: { x: hot.position.x * scale, y: hot.position.y * scale },
@@ -260,7 +260,7 @@ export const getTraceTaggingInfos = async (
       ? styleMap
         ? Promise.resolve(`./icons/${styleMap}.svg`)
         : getSceneApi("./", `./traces/${icon}.svg`)
-      : getSceneApi("oss", `/scene_edit_data/${scene.m}/user/${icon}`);
+      : getSceneApi("oss", `${scene.mapping ? '/' + scene.mapping : ''}/scene_edit_data/${scene.m}/user/${icon}`);
 
     const name = (styleMap && getIconItem(styleMap)?.name) || "";
     const getAttr = getIcon.then(async (url) => getTraceAttri(url, trace));
@@ -356,7 +356,7 @@ export const getBillTaggingInfos = async (
                 `/sdk/images/billboard/${bill.icon}.png`
               );
             })
-        : getSceneApi("oss", `/scene_view_data/${scene.m}/user/${bill.icon}`);
+        : getSceneApi("oss", `${scene.mapping ? '/' + scene.mapping : ''}/scene_view_data/${scene.m}/user/${bill.icon}`);
 
     const yRotate = getBillYaw(bill);
     const name = (styleMap && getIconItem(styleMap)?.name) || "";