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 () { // 地图视图加载完成标识