浏览代码

对接测试环境

bill 3 年之前
父节点
当前提交
770bd9f0ee
共有 6 个文件被更改,包括 45 次插入53 次删除
  1. 1 1
      src/env/index.ts
  2. 1 1
      src/layout/scene-list/index.vue
  3. 4 4
      src/model/app.vue
  4. 2 2
      src/views/tagging/styles.vue
  5. 1 1
      src/views/view/index.vue
  6. 36 44
      vite.config.ts

+ 1 - 1
src/env/index.ts

@@ -47,7 +47,7 @@ export type Params = {
   token?: string
 }
 
-export const baseURL = params.baseURL ? params.baseURL : import.meta.env.DEV ? '/api' : ''
+export const baseURL = params.baseURL ? params.baseURL : '/'
 
 
 export const getResource = (uri: string) => {

+ 1 - 1
src/layout/scene-list/index.vue

@@ -65,7 +65,7 @@ const updateCurrent = (scene: FuseModelType | Scene) => {
 
 <style lang="scss">
 .scene-list > .content > li {
-  padding: 0;
+  padding: 0 !important;
 }
 
 .scene {

+ 4 - 4
src/model/app.vue

@@ -35,9 +35,9 @@ export const Model = defineComponent({
       if (!scene.value) return;
       const type = scene.value.type
       const urls = {
-        [SceneType.SWKK]: `swkk/spg.html?m=${scene.value.num}`,
-        [SceneType.SWKJ]: `swkk/spg.html?m=${scene.value.num}`,
-        [SceneType.SWSS]: `swss/index.html?m=${scene.value.num}`,
+        [SceneType.SWKK]: `/swkk/spg.html?m=${scene.value.num}`,
+        [SceneType.SWKJ]: `/swkk/spg.html?m=${scene.value.num}`,
+        [SceneType.SWSS]: `/swss/index.html?m=${scene.value.num}`,
         [SceneType.SWMX]: `index.html?caseId=${params.caseId}&modelId=${scene.value.num}&token=${params.token}#sign-model`
       }
       return urls[type]
@@ -60,7 +60,7 @@ export const Model = defineComponent({
         let result: any = null, error = null
         try {
           result = await Promise.race([typePromise, modelPromise])
-        } catch (err: Error) {
+        } catch (err: any) {
           error = err
         }
         typeCleanup()

+ 2 - 2
src/views/tagging/styles.vue

@@ -49,9 +49,9 @@
             :active="active" 
             all
             @quitMore="showAll = false" 
-            @uploadStyles="style => emit('uploadStyle', style)" 
+            @uploadStyles="(style: TaggingStyle) => emit('uploadStyle', style)" 
             @change="clickHandler"
-            @delete="style => emit('delete', style)"
+            @delete="(style: TaggingStyle) => emit('delete', style)"
           />
         </ui-bubble>
       </span>

+ 1 - 1
src/views/view/index.vue

@@ -56,7 +56,7 @@ const getView = async () => {
       },
       ...type
     }))
-  } catch (e: Error) {
+  } catch (e: any) {
     console.error(e)
     Message.error(e.message)
   }

+ 36 - 44
vite.config.ts

@@ -4,6 +4,38 @@ import config from './config.js'
 
 import { resolve } from 'path'
 
+const proxy = {
+  '/local': {
+    target: 'http://192.168.0.38:8808',
+    changeOrigin: true,
+    rewrite: path => path.replace(/^\/local/, '')
+  },
+  '/fusion': {
+    target: 'https://test-mix3d.4dkankan.com',
+    changeOrigin: true,
+    rewrite: path => path.replace(/^\/api/, '')
+  },
+  '/swkk': {
+    target: config.dev ? 'https://test.4dkankan.com' : 'https://www.4dkankan.com',
+    changeOrigin: true,
+    rewrite: path => path.replace(/^\/swkk/, '')
+  },
+  '/service': {
+    target: config.dev ? 'https://test.4dkankan.com' : 'https://www.4dkankan.com',
+    changeOrigin: true,
+  },
+  '/swss': {
+    target: config.dev ? 'https://uat-laser.4dkankan.com/uat' : 'https://laser.4dkankan.com',
+    changeOrigin: true,
+    rewrite: path => path.replace(/^\/swss/, '')
+  },
+  '/laser': {
+    target: config.dev ? 'https://uat-laser.4dkankan.com' : 'https://laser.4dkankan.com',
+    changeOrigin: true,
+    rewrite: path => path.replace(/^\/swss/, '')
+  }
+}
+
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [vue()],
@@ -33,49 +65,9 @@ export default defineConfig({
     host: '0.0.0.0',
     port: 5173,
     open: true,
-    proxy: {
-      '/local': {
-        target: 'http://192.168.0.38:8808',
-        changeOrigin: true,
-        rewrite: path => path.replace(/^\/local/, '')
-      },
-      '/api': {
-        target: 'http://192.168.0.47:8808',
-        changeOrigin: true,
-        rewrite: path => path.replace(/^\/api/, '')
-      },
-      '/swkk': {
-        target: config.dev ? 'https://test.4dkankan.com' : 'https://www.4dkankan.com',
-        changeOrigin: true,
-        rewrite: path => path.replace(/^\/swkk/, '')
-      },
-      '/service': {
-        target: config.dev ? 'https://test.4dkankan.com' : 'https://www.4dkankan.com',
-        changeOrigin: true,
-      },
-
-
-      '/swss': {
-        target: config.dev ? 'https://uat-laser.4dkankan.com/uat' : 'https://laser.4dkankan.com',
-        changeOrigin: true,
-        rewrite: path => path.replace(/^\/swss/, '')
-      },
-      '/laser': {
-        target: config.dev ? 'https://uat-laser.4dkankan.com' : 'https://laser.4dkankan.com',
-        changeOrigin: true,
-        rewrite: path => path.replace(/^\/swss/, '')
-      },
-
-      // '/swss': {
-      //   target: 'localhost:8080',
-      //   changeOrigin: true,
-      //   rewrite: path => path.replace(/^\/swss/, '')
-      // },
-      // '/api/laser': {
-      //   target: 'https://uat-laser.4dkankan.com/',
-      //   changeOrigin: true,
-      //   rewrite: path => path.replace(/^\/api/, '')
-      // }
-    }
+    proxy: proxy
+  },
+  preview: {
+    proxy
   }
 })