bill 5 月之前
父节点
当前提交
1aee9e08a3
共有 5 个文件被更改,包括 1316 次插入1738 次删除
  1. 1301 1723
      pnpm-lock.yaml
  2. 3 2
      src/api/fuse-model.ts
  3. 5 3
      src/env/index.ts
  4. 7 7
      src/model/app.vue
  5. 0 3
      vite.config.ts

文件差异内容过多而无法显示
+ 1301 - 1723
pnpm-lock.yaml


+ 3 - 2
src/api/fuse-model.ts

@@ -109,10 +109,11 @@ const serviceToLocal = (
     size: serviceModel.sceneData?.modelSize,
     raw: {
       ...serviceModel.sceneData,
-      laserOSSRoot: params.root ,
+      mapping: offline ? '' : serviceModel.sceneData.mapping,
+      laserOSSRoot: offline ? './' : params.root ,
       // + '/' + serviceModel.sceneData.mapping + '',
       // panoOSSRoot: params.root + '/' +serviceModel.sceneData.mapping + '',
-      panoOSSRoot: params.root  ,
+      panoOSSRoot: offline ? './' : params.root ,
     },
     time: serviceModel.sceneData?.createTime,
     status: serviceModel.sceneData

+ 5 - 3
src/env/index.ts

@@ -105,14 +105,16 @@ if (offline) {
   params.static = ''
   if (import.meta.env.DEV) {
     params.serviceUrl = `/offlineResource/fusion`;
-    params.root = '/offlineResource'
     // params.root = `http://192.168.0.62:9000`;
     params.ossRoot = `http://192.168.0.62:9000`;
-
     params.root = `/offlineResource`;
   } else {
     params.serviceUrl = "/fusion";
+    params.root = ''
+    params.ossRoot = '/'
   }
+  params.root = ''
+  params.static = '/oss/'
 } else {
   // jar服务链接
   params.ip = params.ip || "";
@@ -160,7 +162,7 @@ export const getResources = (uri: string) => {
     return uri;
 
   const ip = params.ip ? `${params.ip}:${params.static}` : ''
-  if (!ip || !params.laserServicePort || !params.ossRoot) return uri
+  if (!ip || !params.laserServicePort || !params.ossRoot) return params.static + uri
 
   const root =
     uri.indexOf(params.static.substring(1)) === 0 ||

+ 7 - 7
src/model/app.vue

@@ -67,14 +67,14 @@ export const Model = defineComponent({
 
       const urls = offline
         ? {
-            [SceneType.SWKK]: `${offlinePrev}swkk/${scene.value.num}/wwwroot/spg.html?m=${scene.value.num}&lang=zh`,
-            [SceneType.DSFXJ]: `${offlinePrev}swkk/${scene.value.num}/wwwroot/spg.html?m=${scene.value.num}&lang=zh`,
-            [SceneType.SWKJ]: `${offlinePrev}swkk/${scene.value.num}/wwwroot/spg.html?m=${scene.value.num}&lang=zh`,
-            [SceneType.SWSS]: `${offlinePrev}swss/${scene.value.num}/www/offline.html?m=${scene.value.num}&lang=zh`,
-            [SceneType.SWSSMX]: `${offlinePrev}swkk/${scene.value.num}/wwwroot/spg.html?m=${scene.value.num}&lang=zh`,
+            [SceneType.SWKK]: `${offlinePrev}/swkk/${scene.value.num}/wwwroot/spg.html?m=${scene.value.num}&lang=zh`,
+            [SceneType.DSFXJ]: `${offlinePrev}/swkk/${scene.value.num}/wwwroot/spg.html?m=${scene.value.num}&lang=zh`,
+            [SceneType.SWKJ]: `${offlinePrev}/swkk/${scene.value.num}/wwwroot/spg.html?m=${scene.value.num}&lang=zh`,
+            [SceneType.SWSS]: `${offlinePrev}/swss/${scene.value.num}/www/offline.html?m=${scene.value.num}&lang=zh`,
+            [SceneType.SWSSMX]: `${offlinePrev}/swkk/${scene.value.num}/wwwroot/spg.html?m=${scene.value.num}&lang=zh`,
             [SceneType.SWMX]: `offline.html?caseId=${params.caseId}&modelId=${scene.value.num}&share=1#sign-model`,
-            [SceneType.SWYDSS]: `${offlinePrev}swss/${scene.value.num}/www/offline.html?m=${scene.value.num}&lang=zh`,
-            [SceneType.SWYDMX]: `${offlinePrev}swkk/${scene.value.num}/wwwroot/spg.html?m=${scene.value.num}&lang=zh`,
+            [SceneType.SWYDSS]: `${offlinePrev}/swss/${scene.value.num}/www/offline.html?m=${scene.value.num}&lang=zh`,
+            [SceneType.SWYDMX]: `${offlinePrev}/swkk/${scene.value.num}/wwwroot/spg.html?m=${scene.value.num}&lang=zh`,
           }
         : {
             [SceneType.SWKK]: `${params.swkkUrl}&m=${scene.value.num}${sign}&app_resource=${params.root}/${mz?.mapping}/`,

+ 0 - 3
vite.config.ts

@@ -1,7 +1,4 @@
-import { defineConfig } from "vite";
 import vue from "@vitejs/plugin-vue";
-import config from "./config.js";
-// import mkcert from "vite-plugin-mkcert";
 import { createServer as createLangServer } from "./scripts/lang";
 
 import { resolve } from "path";