From 7d405680d127a04d75740bb551dd8cc5d5e85978 Mon Sep 17 00:00:00 2001 From: liaoboping <344114999@qq.com> Date: Wed, 17 Sep 2025 20:53:12 +0800 Subject: [PATCH] coding --- .env.development | 1 - public/config.js | 3 +-- src/permission.js | 2 +- src/views/simulationScene/instructor/system/display/index.vue | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.env.development b/.env.development index 37cff62..926ea71 100644 --- a/.env.development +++ b/.env.development @@ -2,4 +2,3 @@ NODE_ENV=development VUE_APP_PREVIEW=true VUE_APP_API_BASE_URL=/api VUE_APP_API_URL=http://192.168.0.189:8099 -VUE_APP_MAPVIEW_URL = ws://192.168.0.189:8099 diff --git a/public/config.js b/public/config.js index 4653853..987f553 100644 --- a/public/config.js +++ b/public/config.js @@ -5,8 +5,7 @@ window._CONFIG = { TerrainProviderUrl: '/map/mapTerrain/', thirdLoginUrl: 'http://127.0.0.1:8080/thirdLogin', clientId: '0123456789', - evaluationSrc: 'http://127.0.0.1:8000', + evaluationSrc: 'http://192.168.0.189:8088/thirdLogin/thirdLoginPage?username=admin', VUE_APP_API_URL: 'http://192.168.0.189:8099', VUE_APP_WEBSOCKET_URL: 'ws://192.168.0.189:8099', - VUE_APP_MAPVIEW_URL:'ws://192.168.0.189:8099' } diff --git a/src/permission.js b/src/permission.js index 202b978..c075635 100644 --- a/src/permission.js +++ b/src/permission.js @@ -13,7 +13,7 @@ NProgress.configure({ showSpinner: false }) // NProgress Configuration const allowList = ['thirdLogin', 'login', 'register', 'registerResult'] // no redirect allowList const loginRoutePath = '/user/login' -const defaultRoutePath = '/user/thirdLogin' +const defaultRoutePath = '/user/welcome' router.beforeEach((to, from, next) => { NProgress.start() // start progress bar diff --git a/src/views/simulationScene/instructor/system/display/index.vue b/src/views/simulationScene/instructor/system/display/index.vue index 3e6faa2..d5f2c0d 100644 --- a/src/views/simulationScene/instructor/system/display/index.vue +++ b/src/views/simulationScene/instructor/system/display/index.vue @@ -97,7 +97,7 @@ export default { initWebSocket() { // 创建连接(替换实际地址) - this.ws = new WebSocket(window._CONFIG.VUE_APP_MAPVIEW_URL+`/ws/${this.scenarioId}/${this.homeId}`) + this.ws = new WebSocket(window._CONFIG.VUE_APP_WEBSOCKET_URL+`/ws/${this.scenarioId}/${this.homeId}`) // 监听连接成功 this.ws.onopen = () => {