bill 8 ماه پیش
والد
کامیت
4f3717e685
3فایلهای تغییر یافته به همراه7 افزوده شده و 7 حذف شده
  1. 1 1
      src/api/fuse-model.ts
  2. 2 2
      src/api/scene.ts
  3. 4 4
      vite.config.ts

+ 1 - 1
src/api/fuse-model.ts

@@ -63,7 +63,7 @@ const serviceToLocal = (serviceModel: ServiceFuseModel, test = false): FuseModel
   title: serviceModel.sceneData ? (serviceModel.sceneData?.name || serviceModel.sceneData.sceneName || serviceModel.sceneData.modelTitle) : '-',
   modelId: serviceModel.sceneData?.modelId,
   fusionId: serviceModel.fusionId,
-  type: serviceModel.sceneData?.type,
+  type: serviceModel.sceneData?.type === 7 ? SceneType.SWSS : serviceModel.sceneData?.type === 8 ? SceneType.SWKK : serviceModel.sceneData?.type,
   size: serviceModel.sceneData?.modelSize,
   time: serviceModel.sceneData?.createTime,
   status: serviceModel.sceneData ? serviceModel.sceneData.status : SceneStatus.ERR

+ 2 - 2
src/api/scene.ts

@@ -11,8 +11,8 @@ export enum SceneType {
   SWSSMX = 4,
   SWYDSS = 5,
   SWYDMX = 6,
-  C_SWKK,
-  C_SWSS,
+  C_SWKK = 8,
+  C_SWSS = 7,
 }
 
 export enum SceneStatus {

+ 4 - 4
vite.config.ts

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