bill 1 年之前
父節點
當前提交
b2bb736edb
共有 6 個文件被更改,包括 1698 次插入1690 次删除
  1. 1 1686
      public/package/data.json
  2. 1686 0
      public/package/data1.json
  3. 3 0
      src/api/offline.ts
  4. 1 1
      src/env/index.ts
  5. 1 1
      src/sdk/association.ts
  6. 6 2
      vite.config.ts

文件差異過大導致無法顯示
+ 1 - 1686
public/package/data.json


文件差異過大導致無法顯示
+ 1686 - 0
public/package/data1.json


+ 3 - 0
src/api/offline.ts

@@ -20,6 +20,9 @@ export const setOfflineAxios = (axios: AxiosInstance) => {
   axios.interceptors.request.use(
     async function (config) {
       const params = {...config.params}
+      if (envParams.caseId) {
+        params.caseId = envParams.caseId
+      }
       let item = data[config.url!+ paramsToStr(params)] 
       if (!item) {
         delete params.caseId

+ 1 - 1
src/env/index.ts

@@ -84,6 +84,6 @@ export const baseURL = params.baseURL ? params.baseURL : '/'
 
 
 export const getResource = (uri: string) => {
-  if (~uri.indexOf('base64') || ~uri.indexOf('bolb') || ~uri.indexOf('//')) return uri
+  if (~uri.indexOf('base64') || ~uri.indexOf('bolb') || ~uri.indexOf('//') || uri.startsWith('/')) return uri
   return `${baseURL}/${uri}`
 }

+ 1 - 1
src/sdk/association.ts

@@ -90,7 +90,7 @@ const setModels = (models: FuseModels, oldModels: FuseModels) => {
         mode: RoutesName.signModel === currentLayout.value! ? 'single' : 'many',
         isDynamicAdded: dynamicAddedModelIds.value.some(id => itemRaw.id === id),
         type: [SceneType.SWSS, SceneType.SWYDSS].includes(item.type) ? 'laser' : item.modelType,
-        url: [SceneType.SWSS, SceneType.SWYDSS].includes(item.type) ? item.url : item.url && getResource(item.url),
+        url: [SceneType.SWSS, SceneType.SWYDSS].includes(item.type) ? item.url : item.url && item.url,
         fromType: item.type
       })
     } catch(e) {

+ 6 - 2
vite.config.ts

@@ -17,12 +17,16 @@ const proxy = {
     rewrite: path => path.replace(/^\/local/, '')
   },
   '/fusion-xj': {
-    target: config.dev ? 'https://xj-mix3d.4dkankan.com/' : 'https://mix3d.4dkankan.com',
+    target: config.dev ? 'http://192.168.0.25' : 'https://192.168.0.25',
     changeOrigin: true,
     rewrite: path => path.replace(/^\/api/, '')
   },
+  '/oss': {
+    target: config.dev ? 'http://192.168.0.25/' : 'https://192.168.0.25',
+    changeOrigin: true,
+  },
   '/swkk': {
-    target: config.dev ? 'https://test.4dkankan.com' : 'https://www.4dkankan.com',
+    target: config.dev ? 'http://192.168.0.25/swkk' : 'https://www.4dkankan.com',
     changeOrigin: true,
     rewrite: path => path.replace(/^\/swkk/, '')
   },