fix: 1

src/api/fuse-model.ts

@@ -54,7 +54,7 @@ const serviceToLocal = (serviceModel: ServiceFuseModel, test = false): FuseModel
   opacity: serviceModel.opacity || 1,
   bottom: serviceModel.bottom || 0,
   fusionNumId: serviceModel.fusionNumId,
-  modelType: serviceModel.sceneData?.modelDateType,
+  modelType: serviceModel.sceneData?.modelType,
   position: serviceModel.transform.position,
   renderType: serviceModel.sceneData.type === SceneType.SWMX ? (serviceModel.sceneData.renderType || 'base') : undefined,
   rotation: serviceModel.transform.rotation,

src/app.vue

@@ -49,7 +49,7 @@ const stopWatch = watch(currentLayout, async (layout) => {
       })
     })
   }
-
+console.error('start')
   params.share = true
   try {
     await refreshCase()
@@ -62,6 +62,7 @@ const stopWatch = watch(currentLayout, async (layout) => {
   } catch (error) {
     await router.replace({name: RoutesName.error})
   }
+  console.error('start2')
 
   stopWatch()
   loaded.value = true

src/env/index.ts

@@ -64,7 +64,7 @@ export const appBackRoot = {
   [appType.xmfire]: "/xmfire",
   [appType.criminal]: "/criminal",
   [appType.police]: "/criminal",
-  [appType.xj]: "/fire"
+  [appType.xj]: "/"
 }
 export const routeIncludeFire = (type: appType) => 
   [appType.fire, appType.xmfire].includes(type)

src/router/index.ts

@@ -1,6 +1,6 @@
 import { createRouter, createWebHashHistory } from 'vue-router'
 import { routes } from './config'
-import { computed } from 'vue'
+import { computed, ref, watchEffect } from 'vue'
 import { RoutesName } from './constant'
 import { metas } from './constant'
 
@@ -39,8 +39,19 @@ export const getRouteConfig = (name: RoutesName, raw: RouteRaw[] = routes): Rout
   }
   return current
 }
+const getName = () => {
+  if (!router.currentRoute.value?.name) {
+    return ''
+  }
+  return getRouteNames(router.currentRoute.value.name as RoutesName, routes);
+}
 
-export const currentRouteNames = computed(() => getRouteNames(router.currentRoute.value.name as RoutesName, routes))
+export const currentRouteNames = ref(getName())
+setInterval(() => {
+  currentRouteNames.value = getName()
+  // console.log(getName())
+}, 100)
+// export const currentRouteNames = computed(() => getRouteNames(router.currentRoute.value.name as RoutesName, routes))
 
 export const currentLayout = computed(() => {
   const names = currentRouteNames.value

vite.config.ts

@@ -12,21 +12,21 @@ if (process.argv.length > 3) {
 
 const proxy = {
   '/local': {
-    target: 'http://192.168.0.38:8808',
+    target: 'https://hccj.xjxf.com:18008/',
     changeOrigin: true,
     rewrite: path => path.replace(/^\/local/, '')
   },
   '/fusion-xj': {
-    target: config.dev ? 'http://192.168.9.27:1800/' : 'http://192.168.9.27:1800/',
+    target: 'https://hccj.xjxf.com:18008/',
     changeOrigin: true,
     rewrite: path => path.replace(/^\/api/, '')
   },
   '/laser':{
-    target: config.dev ? 'http://192.168.9.27:1800' : 'http://192.168.9.27:1800',
+    target: 'https://hccj.xjxf.com:18008/',
     changeOrigin: true,
   },
   '/oss': {
-    target: config.dev ? 'http://192.168.9.27:1800//' : 'http://192.168.9.27:1800/',
+    target: 'https://hccj.xjxf.com:18008/',
     changeOrigin: true,
   },
   // '/swkk': {