From 9b147841d41256d2c048b40993dee8fbb17b345b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=BB=B6=E7=A6=8F?= <> Date: Tue, 16 May 2023 16:33:33 +0800 Subject: [PATCH] =?UTF-8?q?fixed:=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 13 ++++++++++--- .env.production | 13 ++++++++++--- .env.test | 15 +++++++++++---- src/mock/layer.ts | 6 +++--- src/views/overview.component.html | 11 +++++++++++ src/views/overview.component.ts | 6 ++---- 6 files changed, 47 insertions(+), 17 deletions(-) diff --git a/.env.development b/.env.development index 30bc160..a0ddf67 100644 --- a/.env.development +++ b/.env.development @@ -1,12 +1,19 @@ + #开发环境 NODE_ENV:"development" # 页面标题 -VUE_APP_TITLE = 汉邦唐全真数字服务平台 +VUE_APP_TITLE = 汉邦唐消防训练基地 +# 网关地址 +VUE_APP_GATEWAY_URL="/dev-api" # UE4服务地址 VUE_APP_PALYER_URL="192.168.1.66:8080" # 服务地址 -VUE_APP_BASE_API_URL="/dev-api" +VUE_APP_BASE_API_URL="http://192.168.2.3:8081" +# 服务前-- 请严格遵守格式 不允许换行 +VUE_APP_SERVICE_PREFIX= '{"knowledge":"/knowledge","system":"/system"}' +# 是否显示全部菜单 +VUE_APP_ALL_MENU = false # 微前端地址 VUE_APP_REMOTES_URL="http://119.45.158.12/common/" # 当前应用部署地址 -VUE_APP_EXPOSES_URL="" +VUE_APP_EXPOSES_URL="" \ No newline at end of file diff --git a/.env.production b/.env.production index 0726aa9..5131da7 100644 --- a/.env.production +++ b/.env.production @@ -1,11 +1,18 @@ -#生产环境 + +#开发环境 NODE_ENV:"production" # 页面标题 -VUE_APP_TITLE = 汉邦唐全真数字服务平台 +VUE_APP_TITLE = 汉邦唐消防训练基地 +# 网关地址 +VUE_APP_GATEWAY_URL="/dev-api" # UE4服务地址 VUE_APP_PALYER_URL="192.168.1.66:8080" # 服务地址 -VUE_APP_BASE_API_URL="" +VUE_APP_BASE_API_URL="http://192.168.2.3:8081" +# 服务前-- 请严格遵守格式 不允许换行 +VUE_APP_SERVICE_PREFIX= '{"knowledge":"/knowledge","system":"/system"}' +# 是否显示全部菜单 +VUE_APP_ALL_MENU = false # 微前端地址 VUE_APP_REMOTES_URL="http://119.45.158.12/common/" # 当前应用部署地址 diff --git a/.env.test b/.env.test index 611eea5..a0ddf67 100644 --- a/.env.test +++ b/.env.test @@ -1,12 +1,19 @@ -#测试环境 + +#开发环境 NODE_ENV:"development" # 页面标题 -VUE_APP_TITLE = 汉邦唐全真数字服务平台 +VUE_APP_TITLE = 汉邦唐消防训练基地 +# 网关地址 +VUE_APP_GATEWAY_URL="/dev-api" # UE4服务地址 VUE_APP_PALYER_URL="192.168.1.66:8080" # 服务地址 -VUE_APP_BASE_API_URL="" +VUE_APP_BASE_API_URL="http://192.168.2.3:8081" +# 服务前-- 请严格遵守格式 不允许换行 +VUE_APP_SERVICE_PREFIX= '{"knowledge":"/knowledge","system":"/system"}' +# 是否显示全部菜单 +VUE_APP_ALL_MENU = false # 微前端地址 -VUE_APP_REMOTES_URL="http://192.168.2.99:8080" +VUE_APP_REMOTES_URL="http://119.45.158.12/common/" # 当前应用部署地址 VUE_APP_EXPOSES_URL="" \ No newline at end of file diff --git a/src/mock/layer.ts b/src/mock/layer.ts index a6a3e8a..6e4d664 100644 --- a/src/mock/layer.ts +++ b/src/mock/layer.ts @@ -25,7 +25,7 @@ export default [ { value:"bounds", color:COLOR.BOUNDS, selected:false, - pages:["closePark","peopleCar"] + pages:["manage"] },{ name:"人员定位", ids:[] as string[], @@ -36,7 +36,7 @@ export default [ { assetPath:"/JC_CustomAssets/VehicleLibrary/Exhibition/重型货车_01", coordinateType:1, selected:false, - pages:["closePark","peopleCar","smartSafetySupervision","smartEmergency"] + pages:["home","view"] },{ name:"车辆定位", ids:[] as string[], @@ -51,5 +51,5 @@ export default [ { ], coordinateType:1, selected:false, - pages:["closePark","peopleCar","smartSafetySupervision","smartEmergency"] + pages:["home","view"] }] diff --git a/src/views/overview.component.html b/src/views/overview.component.html index d16fce3..859b488 100644 --- a/src/views/overview.component.html +++ b/src/views/overview.component.html @@ -18,6 +18,17 @@
+
+
+ + + +
+
+ +
+
diff --git a/src/views/overview.component.ts b/src/views/overview.component.ts index 46ea354..a2e4b9d 100644 --- a/src/views/overview.component.ts +++ b/src/views/overview.component.ts @@ -26,9 +26,7 @@ export default class OverViewComponent extends BaseComponent { // 是否展开图层 public openLayerDrawer = false; created(){ - this.warnTimer = setInterval(()=>{ - this.upDateEventList() - },10000) + this.currentLayers = this.getCurrentLayers() } public upDateEventList(){ const eventList = MockData.getEventList().data @@ -76,8 +74,8 @@ export default class OverViewComponent extends BaseComponent { public navChange(data: string) { this.currentNav = data; + this.currentLayers = this.getCurrentLayers() if(this.player){ - this.currentLayers = this.getCurrentLayers(); this.resetMap(); } console.log('当前点击导航', data)