fix: 1

src/env/index.ts

@@ -2,6 +2,7 @@ import { stackFactory, flatStacksValue, strToParams } from "@/utils";
 import { reactive, ref } from "vue";
 
 import type { FuseModel, Path, TaggingPosition, View } from "@/store";
+import { lang, langKey } from "@/lang";
 export const viewModeStack = stackFactory(ref<"full" | "auto">("auto"));
 export const showToolbarStack = stackFactory(ref<boolean>(false));
 export const showHeadBarStack = stackFactory(ref<boolean>(true));
@@ -56,11 +57,15 @@ params.caseId = Number(params.caseId);
 params.share = Boolean(Number(params.share));
 params.single = Boolean(Number(params.single));
 
+
+
 export type Params = {
   caseId: number;
   baseURL?: string;
   modelId?: string;
   laserRoot: string;
+  swssUrl: string
+  swkkUrl: string
   panoOSSRoot: string;
   ossRoot: string;
   root: string;
@@ -80,6 +85,7 @@ export type Params = {
   token?: string;
 
   servicePort: string;
+  swkkPort: string
   laserServicePort: string;
 };
 
@@ -102,11 +108,23 @@ if (import.meta.env.DEV) {
   // params.static = "/profile";
   // params.laserServicePort = "9008";
   // params.servicePort = "8808";
+  // params.swssUrl = '/swss'
+  // params.swkkUrl = '/swkk'
 } else {
+  // jar服务链接
   params.ip = params.ip || "";
+  // 融合的mapping
   params.static = params.static || "";
+  // 激光服务端口
   params.laserServicePort = params.laserServicePort || "";
+  // 融合服务端口
   params.servicePort = params.servicePort || "";
+  // 四维看看查看路径 的spc.html
+  params.swssUrl = params.swssUrl || ""
+  // 四维深时的路径 index.html
+  params.swkkUrl = params.swkkUrl || ""
+  // 四维看看的服务端口
+  params.swkkPort = params.swkkPort || "8088"
 }
 
 const ip = params.ip + ":";
@@ -115,11 +133,12 @@ params.ossRoot = `${ip}${params.laserServicePort}${params.static}`;
 params.serviceUrl = `${ip}${params.servicePort}/fusion`;
 params.laserRoot = params.root;
 
-// params.laserOSSRoot = 'asd/'
-
-params.serviceUrl = "/fusion";
+// params.serviceUrl = "/fusion";
 export let namespace = params.serviceUrl;
 
+params.swssUrl =  `${params.swssUrl}?lang=${langKey}&serve_link=${params.laserRoot}&basePath=${params.laserRoot}`
+params.swkkUrl =  `${params.swkkUrl}?lang=${langKey}&app_server=${ip}${params.swkkPort}`
+
 export const getResources = (uri: string) => {
   uri = uri.replaceAll("\\", "/");
   uri = uri.replaceAll("\\", "/");

src/lang/index.ts

@@ -11,7 +11,7 @@ export enum langNameEum {
   zh = 'zh',
   en = 'en',
 }
-console.log('en', JSON.stringify(en))
+console.log('en', JSON.stringify(zh))
 
 export const langNameDescs = {
   [langNameEum.zh]: '中文',
@@ -32,10 +32,10 @@ type I18n = BaseI18n & {
 const localKey = 'lang'
 const local = {
   get: localGetFactory(str => {
+    const langs = Object.keys(langNameDescs)
     if (str) {
-      return str as langNameEum
+      return langs.includes(str) ? str : langNameEum.zh
     } else {
-      const langs = Object.keys(langNameDescs)
       const defLang = window?.navigator?.language || 'zh'
       const navLang = langs.find(lang =>
         new RegExp(`-?${lang}-?`).test(defLang)
@@ -70,6 +70,7 @@ export const langs = {
   [langNameEum.en]: en,
   [langNameEum.zh]: zh,
 }
+console.error(langKey)
 export const lang = langs[langKey] as typeof zh
 
 i18n.global.setLocaleMessage(langNameEum.zh, zh)

src/model/app.vue

@@ -1,5 +1,5 @@
 <template>
-  <iframe class="external" :src="getResources(url)" ref="iframeRef" v-if="url"></iframe>
+  <iframe class="external" :src="url" ref="iframeRef" v-if="url"></iframe>
   <div class="laser-layer" v-show="!url">
     <div class="scene-canvas" ref="fuseRef">
       <div id="direction"></div>
@@ -9,7 +9,7 @@
 
 <script lang="ts">
 import { defineComponent, ref, watchEffect, computed, watch, nextTick } from "vue";
-import { SceneType } from "@/store";
+import { scenes, SceneType } from "@/store";
 import { getResources, params } from "@/env";
 import { fuseModel, modelProps } from "./index";
 import { modelSDKFactory } from "./platform";
@@ -59,8 +59,12 @@ export const Model = defineComponent({
       if (!scene.value) {
         return setUrl("");
       }
+      
       const type = scene.value.type;
+      const mz = scenes.value.find(item => item.num === (scene as any).value.num)
+      console.error(mz)
       const sign = params.sign ? `&sign=${params.sign}` : "";
+
       const urls = offline
         ? {
             [SceneType.SWKK]: `${offlinePrev}swkk/${scene.value.num}/wwwroot/spg.html?m=${scene.value.num}&lang=zh`,
@@ -73,44 +77,16 @@ export const Model = defineComponent({
             [SceneType.SWYDMX]: `${offlinePrev}swkk/${scene.value.num}/wwwroot/spg.html?m=${scene.value.num}&lang=zh`,
           }
         : {
-            [SceneType.SWKK]: `/swkk/spg.html?m=${scene.value.num}${sign}`,
-            [SceneType.DSFXJ]: `/swkk/spg.html?m=${scene.value.num}${sign}`,
-            [SceneType.SWKJ]: `/swkk/spg.html?m=${scene.value.num}${sign}`,
-            [SceneType.SWSS]: `/swss/index.html?m=${scene.value.num}${sign}`,
-            [SceneType.SWSSMX]: `/swkk/spg.html?m=${scene.value.num}${sign}`,
+            [SceneType.SWKK]: `${params.swkkUrl}&m=${scene.value.num}${sign}&app_resource=${params.root}/${mz?.mapping}`,
+            [SceneType.DSFXJ]: `${params.swkkUrl}&m=${scene.value.num}${sign}&app_resource=${params.root}/${mz?.mapping}`,
+            [SceneType.SWKJ]: `${params.swkkUrl}&m=${scene.value.num}${sign}&app_resource=${params.root}/${mz?.mapping}`,
+            [SceneType.SWSSMX]: `${params.swkkUrl}&m=${scene.value.num}${sign}&app_resource=${params.root}/${mz?.mapping}`,
+            [SceneType.SWSS]: `${params.swssUrl}&m=${scene.value.num}${sign}&mapping=${mz?.mapping}`,
+            [SceneType.SWYDSS]: `${params.swssUrl}&m=${scene.value.num}${sign}&mapping=${mz?.mapping}`,
+            [SceneType.SWYDMX]: `${params.swkkUrl}&m=${scene.value.num}${sign}&app_resource=${params.root}/${mz?.mapping}`,
             [SceneType.SWMX]: `index.html?caseId=${params.caseId}&modelId=${scene.value.num}${sign}#sign-model`,
-            [SceneType.SWYDSS]: `/swss/index.html?m=${scene.value.num}${sign}`,
-            [SceneType.SWYDMX]: `/swkk/spg.html?m=${scene.value.num}${sign}`,
           };
 
-      if (import.meta.env.DEV && !offline) {
-        Object.assign(urls, {
-          [SceneType.SWKK]: `/swkk/spg.html?m=${
-            scene.value.num
-          }&toen=${getToken()}${sign}`,
-          [SceneType.DSFXJ]: `/swkk/spg.html?m=${
-            scene.value.num
-          }&toen=${getToken()}${sign}`,
-          [SceneType.SWKJ]: `/swkk/spg.html?m=${
-            scene.value.num
-          }&toen=${getToken()}${sign}`,
-          [SceneType.SWSS]: `/swss/index.html?m=${
-            scene.value.num
-          }&toen=${getToken()}${sign}`,
-          [SceneType.SWSSMX]: `/swkk/spg.html?m=${
-            scene.value.num
-          }&toen=${getToken()}${sign}`,
-          [SceneType.SWMX]: `index.html?caseId=${params.caseId}&modelId=${
-            scene.value.num
-          }&toen=${getToken()}${sign}#sign-model`,
-          [SceneType.SWYDSS]: `/swss/index.html?m=${
-            scene.value.num
-          }${sign}&toen=${getToken()}`,
-          [SceneType.SWYDMX]: `/swkk/spg.html?m=${
-            scene.value.num
-          }${sign}&toen=${getToken()}`,
-        });
-      }
       setUrl(urls[type]);
     });