bill 5 tháng trước cách đây
mục cha
commit
4a3dda4dec
5 tập tin đã thay đổi với 50 bổ sung36 xóa
  1. 3 3
      src/api/offline.ts
  2. 33 24
      src/env/index.ts
  3. 5 5
      src/model/app.vue
  4. 3 3
      src/model/platform.ts
  5. 6 1
      vite.config.ts

+ 3 - 3
src/api/offline.ts

@@ -1,13 +1,13 @@
-import { params as envParams } from "@/env";
+import { params as envParams, params } from "@/env";
 import { paramsToStr, strToParams } from "@/utils/params";
 import { AxiosInstance } from "axios";
 import {namespace} from '@/env'
 import Axios from 'axios'
 
-export const offlinePrev = import.meta.env.DEV ? './offlineData/' : './'
+export const offlinePrev = params.root
 export const setOfflineAxios = (axios: AxiosInstance) => {
   const data: {[key in string]: any} = {}
-  Axios.get(`./${offlinePrev}package/data.json`, {headers: { Accept: "application/json"}}).then(res => {
+  Axios.get(`${offlinePrev}/package/data.json`, {headers: { Accept: "application/json"}}).then(res => {
     Object.assign(data, res.data)
     const prev = import.meta.env.DEV ? offlinePrev : offlinePrev.substring(0, offlinePrev.length - 1)
     for (const key in data) {

+ 33 - 24
src/env/index.ts

@@ -57,15 +57,13 @@ 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
+  swssUrl: string;
+  swkkUrl: string;
   panoOSSRoot: string;
   ossRoot: string;
   root: string;
@@ -85,7 +83,7 @@ export type Params = {
   token?: string;
 
   servicePort: string;
-  swkkPort: string
+  swkkPort: string;
   laserServicePort: string;
 };
 
@@ -103,13 +101,18 @@ export const getResource = (uri: string) => {
 };
 // /fusion
 
-if (import.meta.env.DEV) {
-  // params.ip = "http://192.168.0.62";
-  // params.static = "/profile";
-  // params.laserServicePort = "9008";
-  // params.servicePort = "8808";
-  // params.swssUrl = '/swss'
-  // params.swkkUrl = '/swkk'
+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";
+  }
 } else {
   // jar服务链接
   params.ip = params.ip || "";
@@ -120,26 +123,28 @@ if (import.meta.env.DEV) {
   // 融合服务端口
   params.servicePort = params.servicePort || "";
   // 四维看看查看路径 的spc.html
-  params.swssUrl = params.swssUrl || ""
+  params.swssUrl = params.swssUrl || "";
   // 四维深时的路径 index.html
-  params.swkkUrl = params.swkkUrl || ""
+  params.swkkUrl = params.swkkUrl || "";
   // 四维看看的服务端口
-  params.swkkPort = params.swkkPort || "8088"
-}
+  params.swkkPort = params.swkkPort || "8088";
 
-const ip = params.ip + ":";
-params.root = `${ip}${params.laserServicePort}`;
-params.ossRoot = `${ip}${params.laserServicePort}${params.static}`;
-params.serviceUrl = `${ip}${params.servicePort}/fusion`;
-params.laserRoot = params.root;
+  const ip = params.ip ? params.ip + ":" : "";
+  params.root = `${ip}${params.laserServicePort}`;
+  params.ossRoot = `${ip}${params.laserServicePort}${params.static}`;
+  params.serviceUrl = `${ip}${params.servicePort}/fusion`;
+  params.laserRoot = params.root;
+
+  params.swssUrl = `${params.swssUrl}?lang=${langKey}&serve_link=${params.laserRoot}&basePath=${params.laserRoot}`;
+  params.swkkUrl = `${params.swkkUrl}?lang=${langKey}&app_server=${ip}${params.swkkPort}`;
+}
 
 // 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("\\", "/");
   uri = uri.replaceAll("\\", "/");
@@ -154,11 +159,15 @@ export const getResources = (uri: string) => {
   )
     return uri;
 
+  const ip = params.ip ? `${params.ip}:${params.static}` : ''
+  if (!ip || !params.laserServicePort || !params.ossRoot) return uri
+
   const root =
     uri.indexOf(params.static.substring(1)) === 0 ||
     uri.indexOf(params.static) === 0
       ? `${ip}${params.laserServicePort}`
       : params.ossRoot;
+
   const baseURL = new URL(root);
   const url = new URL(uri, root);
   console.log(root, uri);

+ 5 - 5
src/model/app.vue

@@ -77,13 +77,13 @@ export const Model = defineComponent({
             [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}`,
-            [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.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.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`,
           };
 

+ 3 - 3
src/model/platform.ts

@@ -38,10 +38,10 @@ export async function modelSDKFactory(
   if (type === fuseModel) {
     if (!fuseInitialed) {
       await initialSDK({
-        laserRoot: offline ? offlinePrev : params.laserRoot,
-        panoOSSRoot: offline ? offlinePrev : params.panoOSSRoot,
+        // laserRoot: offline ? offlinePrev : params.laserRoot,
+        // panoOSSRoot: offline ? offlinePrev : params.panoOSSRoot,
         ossRoot: offline ? offlinePrev : params.ossRoot,
-        laserOSSRoot: offline ? offlinePrev : params.laserOSSRoot,
+        // laserOSSRoot: offline ? offlinePrev : params.laserOSSRoot,
         layout: dom,
         scenes: scenes.value,
         lonlat: center,

+ 6 - 1
vite.config.ts

@@ -7,7 +7,7 @@ import { createServer as createLangServer } from "./scripts/lang";
 import { resolve } from "path";
 
 const langProt = 7072;
-const ip = `http://192.168.0.62:8808`;
+const ip = `http://192.168.0.62:9000`;
 const proxy = {
   "/dev": {
     target: `http://localhost:${langProt}`,
@@ -30,6 +30,11 @@ const proxy = {
     changeOrigin: true,
     rewrite: (path) => path.replace(/^\/local/, ""),
   },
+  "/offlineResource": {
+    target: ip,
+    changeOrigin: true,
+    rewrite: (path) => path.replace(/^\/offlineResource/, ""),
+  },
   "/fusion": {
     target: ip,
     changeOrigin: true,