fix: 1

profile/.env.exe

@@ -4,7 +4,7 @@ VITE_ENTRY='/example/fuse/enter-exe.ts'
 VITE_ENTRY_EXAMPLE='./main.ts'
 
 VITE_ORIGIN='params'
-VITE_MESH_VIEW='./static/kankan.html?m={m}&lang=zh&env=dev'
+VITE_MESH_VIEW='./static/kankan.html?m={m}&lang=zh&host=../../mesh&server={server}&oss={oss}{mapping}/'
 VITE_CLOUD_VIEW='http://192.168.0.125:1804/swss/index.html?m={m}&lang=zh'
 VITE_FUSE_VIEW='http://192.168.0.125:1804/code/'
 VITE_LOGIN_VIEW='http://192.168.0.125:1804/admin/#/statistics/scene?redirect={redirect}'

profile/.env.exedev

@@ -5,7 +5,7 @@ VITE_ENTRY_EXAMPLE='./main.ts'
 VITE_MOCK_ENV=exetest
 
 
-# VITE_ORIGIN='params'
+VITE_ORIGIN='params'
 VITE_STATIC='http://192.168.0.125:1804/'
 VITE_OSS='/oss/'
 VITE_OSS_ROOT="/rootOss/"
@@ -14,7 +14,9 @@ VITE_MESH_API='/meshAPI/'
 VITE_CLOUD_API='/cloudAPI/'
 VITE_FUSE_API='/fuseAPI/'
 
-VITE_MESH_VIEW='./static/kankan.html?m={m}&lang=zh&env=dev'
+
+# VITE_MESH_VIEW='./static/kankan.html?m={m}&lang=zh&host=../../mesh&server={server}&oss={oss}{mapping}/'
+VITE_MESH_VIEW='./static/kankan.html?m={m}&lang=zh&host=http://192.168.9.165:5000/mesh&server={server}&oss={oss}{mapping}/'
 VITE_CLOUD_VIEW='http://192.168.0.125:1804/swss/index.html?m={m}&lang=zh'
 VITE_FUSE_VIEW='http://192.168.0.125:1804/code/'
 VITE_LOGIN_VIEW='http://192.168.0.125:1804/admin/#/statistics/scene?redirect={redirect}'

profile/.env.exetest

@@ -12,7 +12,7 @@ VITE_MESH_API='http://192.168.0.125:1804/'
 VITE_CLOUD_API='http://192.168.0.125:1804/'
 VITE_FUSE_API='http://192.168.9.165:8808/'
 
-VITE_MESH_VIEW='./static/kankan.html?m={m}&lang=zh&env=dev'
+VITE_MESH_VIEW='./static/kankan.html?m={m}&lang=zh&host=../../mesh&oss=http://192.168.9.165:9008/'
 VITE_CLOUD_VIEW='http://192.168.0.125:1804/swss/index.html?m={m}&lang=zh'
 VITE_FUSE_VIEW='http://192.168.0.125:1804/code/'
 VITE_LOGIN_VIEW='http://192.168.0.125:1804/admin/#/statistics/scene?redirect={redirect}'

public/static/kankan.html

@@ -276,11 +276,13 @@
       document.querySelector('#modes').style.setProperty('--top', (- Array.from($items).indexOf($item)) * 40 + 'px')
 
       setTimeout(() => {
+        const allFloor = document.querySelector(`li[attr-id='all']`)
+        if (!allFloor) return;
         if (id === 'dollhouse') {
           setCurrentFloor('all')
-          document.querySelector(`li[attr-id='all']`).classList.remove('disabled')
+          allFloor.classList.remove('disabled')
         } else {
-          document.querySelector(`li[attr-id='all']`).classList.add('disabled')
+          allFloor.classList.add('disabled')
         }
       }, 300)
     }

src/core/components/image/temp-image.vue

@@ -36,7 +36,7 @@ watch(
   () => data.value.url,
   async (url) => {
     image.value = null;
-    image.value = await getImage(url);
+    image.value = await getImage(window.platform.getResource(url));
   },
   { immediate: true }
 );

src/core/hook/use-expose.ts

@@ -75,7 +75,7 @@ export const useAutoPaste = () => {
             true
           );
         } else {
-          const image = await getImage(url);
+          const image = await getImage(window.platform.getResource(url));
           drawAPI.addShape(
             "image",
             { url, width: image.width, height: image.height },

src/example/components/slide/actions.ts

@@ -98,7 +98,7 @@ export const imp: MenuItem = {
         }
 
         const url = await window.platform.uploadResourse(files[0]);
-        const image = await getImage(url);
+        const image = await getImage(window.platform.getResource(url));
         ElMessage.warning("请在画图面板中选择放置位置，鼠标右键取消");
         draw.enterDrawShape(
           "image",

src/example/fuse/enter-exe.ts

@@ -1,5 +1,6 @@
+import { tempStrFill } from "@/utils/shared";
 import { params } from "../env";
-import { postFile, resourceURLS, SCENE_TYPE } from "./enter-shared";
+import { postFile, resourceURLS, SCENE_TYPE, viewURLS } from "./enter-shared";
 
 let load: Promise<any>;
 if (import.meta.env.VITE_ORIGIN === "params") {
@@ -8,10 +9,12 @@ if (import.meta.env.VITE_ORIGIN === "params") {
   resourceURLS[SCENE_TYPE.cloud] = params.value.laser_server;
   resourceURLS[SCENE_TYPE.mesh] = params.value.mesh_server;
   resourceURLS[SCENE_TYPE.fuse] = params.value.fuse_server;
-  load = import("./enter");
-} else {
-  load = import("./enter");
 }
+load = import("./enter");
+viewURLS[SCENE_TYPE.mesh] = tempStrFill(viewURLS[SCENE_TYPE.mesh], {
+  oss: resourceURLS.oss,
+  server: resourceURLS[SCENE_TYPE.mesh],
+});
 load.then((p) => {
   window.platform.preventLogin = true;
 
@@ -20,6 +23,13 @@ load.then((p) => {
     if (url.includes("//")) {
       return url;
     }
-    return `${resourceURLS.oss}${url}`;
+    return `${url}`;
+  };
+  window.platform.getResource = (url: string) => {
+    if (url.includes("//")) {
+      return url;
+    } else {
+      return `${resourceURLS.oss}${url}`;
+    }
   };
 });

src/example/fuse/enter-shared.ts

@@ -68,6 +68,7 @@ export const postFile = (url: string, data: Record<string, any>) => {
   }
 
   const l = `${resourceURLS[SCENE_TYPE.fuse]}${url}`;
+  console.log(l)
   return after(
     fetch(l, {
       headers: window.platform.getHeaders(),
@@ -136,14 +137,13 @@ const after = async (fet: Promise<Response>) => {
     throw `${res.message}，即将退出`;
   }
 
-
   if ([4008, 4010, 7012].includes(res.code)) {
     setTimeout(() => {
       window.platform.login(res.code !== 7012);
     }, 1000);
     throw res.message;
   }
-  
+
   if (res.code !== 0) {
     bus.emit("requestError", res);
   }
@@ -317,17 +317,19 @@ export const saveTabulationData = genLoading(
   }
 );
 
-export const uploadResourse = genLoading(async (file: File) => {
-  const url = await postFile(`fusion/upload/file`, { file });
+export const uploadResourse = genLoading(
+  async (file: File) => await postFile(`fusion/upload/file`, { file })
+);
+
+export const getResource = (url: string) => {
   if (url.includes("//")) {
     return url;
-  }
-  if (import.meta.env.DEV && import.meta.env.VITE_STATIC) {
+  } else if (import.meta.env.DEV && import.meta.env.VITE_STATIC) {
     return `${import.meta.env.VITE_STATIC}${url}`;
   } else {
     return url;
   }
-});
+};
 
 export const getTableTemp = () => {
   let table: Record<string, string>;

src/example/fuse/views/tabulation/gen-tab.ts

@@ -121,7 +121,7 @@ export const genTabulationData = async (
 
   const getCover = async () => {
     if (!cover) return;
-    const image = await getImage(cover.url);
+    const image = await getImage(window.platform.getResource(cover.url));
     const rectScale = image.width / image.height;
     const tableCoverScale = tableCoverWidth / tableCoverHeight;
 

src/example/fuse/views/tabulation/index.vue

@@ -59,7 +59,7 @@ const setMap = async (config: { url: string; size: Size }) => {
   const compass = 0;
 
   if (config.url && config.size.height && config.size.width) {
-    const size = await getImageSize(config.url);
+    const size = await getImageSize(window.platform.getResource(config.url));
     const cover = {
       url: config.url,
       ...size,
@@ -78,7 +78,7 @@ const setMap = async (config: { url: string; size: Size }) => {
 };
 
 const setMapHandler = async (config: { url: string; size: Size }) => {
-  const size = await getImageSize(config.url);
+  const size = await getImageSize(window.platform.getResource(config.url));
   const cover = {
     url: config.url,
     ...size,