From 750e0c8a7c6dc4894e7df928005fb01b072697d6 Mon Sep 17 00:00:00 2001 From: fan Date: Thu, 15 Dec 2022 17:42:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=97=E4=BA=AC=E4=BA=8C=E5=8F=B7=E7=BA=BF?= =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=BC=94=E7=BB=83=E5=BE=AA=E7=8E=AF=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/baseUrl.js | 4 ++-- src/views/newMap/jointTrainingNew/index.vue | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index f2fc0a080..e2536b2c3 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -23,8 +23,8 @@ export function handlerUrl(data) { let BASE_SITE; if (process.env.NODE_ENV === 'development') { // const data = null; - BASE_API = 'https://joylink.club/jlcloud'; - // BASE_API = 'https://test.joylink.club/jlcloud'; + // BASE_API = 'https://joylink.club/jlcloud'; + BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.3.233/rtss-server'; // BASE_API = 'http://114.116.51.125/jlcloud'; // BASE_API = 'http://192.168.3.90:9000'; // 周寅 diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue index 84b1d1ba4..3873067fc 100644 --- a/src/views/newMap/jointTrainingNew/index.vue +++ b/src/views/newMap/jointTrainingNew/index.vue @@ -235,7 +235,12 @@ export default { '$store.state.map.mapDataLoadedCount':function(val) { const roleList = ['STATION_SUPERVISOR', 'STATION_ASSISTANT']; if (roleList.includes(this.$store.state.training.roles)) { - this.stationRoleShow(this.showStation); + const list = []; + const mapDevice = this.$store.state.map.mapDevice; + for (const key in mapDevice) { + list.push(mapDevice[key]); + } + this.$jlmap.updateShowMode(list, '02'); } }, '$store.state.map.mapViewLoadedCount': function () { // 地图视图加载完成标识