From 3f35cfab9134127be3c4c136b6b7763c51e492e7 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Wed, 11 May 2022 16:02:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E9=93=81=E8=B0=83=E6=95=B4=20n2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/shape/graph/Station/index.js | 2 +- src/jmapNew/theme/datie_02/menus/menuButton.vue | 6 ++++-- src/utils/baseUrl.js | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/jmapNew/shape/graph/Station/index.js b/src/jmapNew/shape/graph/Station/index.js index 199fa7cd1..fb4395d2c 100644 --- a/src/jmapNew/shape/graph/Station/index.js +++ b/src/jmapNew/shape/graph/Station/index.js @@ -699,7 +699,7 @@ export default class Station extends Group { } else if (!store.getters['map/checkDeviceShow'](this._code)) { this.eachChild(item => { item.hide(); }); } else { - store.getters['map/checkStationGuideMaster'](this._code, model.sGuideMasterLock, model.xGuideMasterLock); + store.getters['map/checkStationGuideMaster'](this._code, model.sguideMasterLock, model.xguideMasterLock); model.controlMode && this['handle' + model.controlMode](); model.preResetValidDuration && this.handlePreResetLamp(); model.controller && this.handleComplexControl(model.controller); diff --git a/src/jmapNew/theme/datie_02/menus/menuButton.vue b/src/jmapNew/theme/datie_02/menus/menuButton.vue index 973a08786..86a4ee0d1 100644 --- a/src/jmapNew/theme/datie_02/menus/menuButton.vue +++ b/src/jmapNew/theme/datie_02/menus/menuButton.vue @@ -272,8 +272,10 @@ export default { } }, '$store.state.map.showCentralizedStationCode': function(val) { - const station = this.$store.getters['map/getDeviceByCode'](val); - this.$store.getters['map/checkStationGuideMaster'](station.code, station.sGuideMasterLock, station.xGuideMasterLock); + if (val){ + const station = this.$store.getters['map/getDeviceByCode'](val); + this.$store.getters['map/checkStationGuideMaster'](station.code, station.sGuideMasterLock, station.xGuideMasterLock); + } }, }, beforeDestroy() { diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index b03cc6b8e..0fc3289a1 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -28,7 +28,7 @@ export function handlerUrl(data) { // BASE_API = 'http://114.116.51.125/jlcloud'; // BASE_API = 'http://192.168.8.152:9000'; // 袁琪 // BASE_API = 'http://192.168.8.172:9200'; // 旭强 - // BASE_API = 'http://192.168.3.15:9000'; // 张赛 + BASE_API = 'http://192.168.3.15:9000'; // 张赛 // BASE_API = 'http://192.168.8.140:9000'; // 杜康 // BASE_API = 'http://192.168.3.37:9000'; // 卫志宏 // BASE_API = 'http://b29z135112.zicp.vip';