From 92a782de6b87acd72ed59c5cf9129aa9151aaa2f Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Sun, 29 Sep 2024 14:07:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=BB=E9=9D=A2=E7=AE=A1=E7=90=86=E5=A4=84?= =?UTF-8?q?=E7=90=86=E8=AE=BE=E5=A4=87map=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/datie_02/menus/ctcWorkMenu.vue | 4 ++-- .../theme/datie_02/menus/dialog/regionBatchOperation.vue | 2 +- src/views/designPlatform/bigScreen.vue | 2 +- src/views/newMap/display/terminals/bigScreen.vue | 2 +- src/views/newMap/display/terminals/dispatchWork.vue | 2 +- src/views/newMap/display/terminals/emergencyDispatchWork.vue | 2 +- src/views/newMap/display/terminals/interlockWork.vue | 2 +- src/views/newMap/display/terminals/lineMonitor.vue | 2 +- src/views/newMap/display/terminals/localWork.vue | 2 +- src/views/newMap/display/terminals/trafficTerminalWork.vue | 2 +- src/views/newMap/display/terminals/troDetailWork.vue | 2 +- src/views/newMap/display/terminals/troWork.vue | 2 +- src/views/newMap/mapDraftPicture/index.vue | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/jmapNew/theme/datie_02/menus/ctcWorkMenu.vue b/src/jmapNew/theme/datie_02/menus/ctcWorkMenu.vue index 7a3b42018..8e8455050 100644 --- a/src/jmapNew/theme/datie_02/menus/ctcWorkMenu.vue +++ b/src/jmapNew/theme/datie_02/menus/ctcWorkMenu.vue @@ -299,7 +299,7 @@ export default { const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCodes && picture.stationCodes.includes(this.roleDeviceCode) && picture.type === 'lucency'); if (picture) { this.$jlmap.updateShowStation(list, ''); - this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); + this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap || {}); const deviceList = []; const mapDevice = this.$store.state.map.mapDevice; for (const deviceCode in mapDevice) { @@ -320,7 +320,7 @@ export default { if (this.$store.state.map.map && this.$store.state.map.map.pictureList) { const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCodes && picture.stationCodes.includes(this.roleDeviceCode) && picture.type === 'chainStation'); if (picture) { - this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); + this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap || {}); const deviceList = []; const mapDevice = this.$store.state.map.mapDevice; for (const deviceCode in mapDevice) { diff --git a/src/jmapNew/theme/datie_02/menus/dialog/regionBatchOperation.vue b/src/jmapNew/theme/datie_02/menus/dialog/regionBatchOperation.vue index d022f2322..2c838be88 100644 --- a/src/jmapNew/theme/datie_02/menus/dialog/regionBatchOperation.vue +++ b/src/jmapNew/theme/datie_02/menus/dialog/regionBatchOperation.vue @@ -100,7 +100,7 @@ export default { this.show = true this.$nextTick(() => { const picData = this.mapData.pictureList.find(pic => pic.stationCodes.includes(stationCode) && pic.type === 'regionBatchOperation') - this.$store.dispatch('map/setPictureDeviceMap', picData.deviceMap) + this.$store.dispatch('map/setPictureDeviceMap', picData.deviceMap || {}) const list = [] for (const deviceCode in picData.deviceMap) { list.push(deviceCode) diff --git a/src/views/designPlatform/bigScreen.vue b/src/views/designPlatform/bigScreen.vue index 7df15f81d..ff8303706 100644 --- a/src/views/designPlatform/bigScreen.vue +++ b/src/views/designPlatform/bigScreen.vue @@ -131,7 +131,7 @@ export default { picture = this.$store.state.map.map.pictureList.find(picture => picture.type === 'bigScreen'); } if (picture) { - this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); + this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap || {}); const deviceList = []; const mapDevice = this.$store.state.map.mapDevice; for (const deviceCode in mapDevice) { diff --git a/src/views/newMap/display/terminals/bigScreen.vue b/src/views/newMap/display/terminals/bigScreen.vue index a67e34b82..16de62378 100644 --- a/src/views/newMap/display/terminals/bigScreen.vue +++ b/src/views/newMap/display/terminals/bigScreen.vue @@ -49,7 +49,7 @@ export default { if (this.mapData && this.mapData.pictureList) { const picture = this.$store.state.map.map.pictureList.find(picture => picture.type === 'bigScreen'); if (picture) { - this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); + this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap || {}); const deviceList = []; const mapDevice = this.$store.state.map.mapDevice; for (const deviceCode in mapDevice) { diff --git a/src/views/newMap/display/terminals/dispatchWork.vue b/src/views/newMap/display/terminals/dispatchWork.vue index e29d64eb1..a0105ee85 100644 --- a/src/views/newMap/display/terminals/dispatchWork.vue +++ b/src/views/newMap/display/terminals/dispatchWork.vue @@ -97,7 +97,7 @@ export default { list.push(this.mapDevice[key]); deviceList.push(key); } - this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); + this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap || {}); setTimeout(() => { this.$jlmap.updatePicture(deviceList); const trainingDetail = this.$store.state.trainingNew.trainingDetail; diff --git a/src/views/newMap/display/terminals/emergencyDispatchWork.vue b/src/views/newMap/display/terminals/emergencyDispatchWork.vue index cc5e16649..3a6e13e4e 100644 --- a/src/views/newMap/display/terminals/emergencyDispatchWork.vue +++ b/src/views/newMap/display/terminals/emergencyDispatchWork.vue @@ -61,7 +61,7 @@ export default { if (this.mapData && this.mapData.pictureList) { const picture = this.$store.state.map.map.pictureList.find(picture => picture.type === 'bigScreen'); if (picture) { - this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); + this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap || {}); const deviceList = []; const mapDevice = this.$store.state.map.mapDevice; for (const deviceCode in mapDevice) { diff --git a/src/views/newMap/display/terminals/interlockWork.vue b/src/views/newMap/display/terminals/interlockWork.vue index 4c3bc082a..a34bfbf03 100644 --- a/src/views/newMap/display/terminals/interlockWork.vue +++ b/src/views/newMap/display/terminals/interlockWork.vue @@ -82,7 +82,7 @@ export default { deviceList.push(key); } this.$jlmap.updateShowStation(list); - this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); + this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap || {}); setTimeout(() => { this.$jlmap.updatePicture(deviceList); this.$jlmap.updateTransform(picture.scaling, picture.origin); diff --git a/src/views/newMap/display/terminals/lineMonitor.vue b/src/views/newMap/display/terminals/lineMonitor.vue index 1cf33fbb5..7f2d2fae3 100644 --- a/src/views/newMap/display/terminals/lineMonitor.vue +++ b/src/views/newMap/display/terminals/lineMonitor.vue @@ -89,7 +89,7 @@ export default { list.push(this.mapDevice[key]); deviceList.push(key); } - this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); + this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap || {}); setTimeout(() => { this.$jlmap.updatePicture(deviceList); const trainingDetail = this.$store.state.trainingNew.trainingDetail; diff --git a/src/views/newMap/display/terminals/localWork.vue b/src/views/newMap/display/terminals/localWork.vue index 446fbfc02..4bf81bb12 100644 --- a/src/views/newMap/display/terminals/localWork.vue +++ b/src/views/newMap/display/terminals/localWork.vue @@ -117,7 +117,7 @@ export default { deviceList.push(key); } this.$jlmap.updateShowStation(list); - this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); + this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap || {}); setTimeout(() => { this.$jlmap.updatePicture(deviceList); const trainingDetail = this.$store.state.trainingNew.trainingDetail; diff --git a/src/views/newMap/display/terminals/trafficTerminalWork.vue b/src/views/newMap/display/terminals/trafficTerminalWork.vue index 74b716050..5f411eadb 100644 --- a/src/views/newMap/display/terminals/trafficTerminalWork.vue +++ b/src/views/newMap/display/terminals/trafficTerminalWork.vue @@ -92,7 +92,7 @@ export default { deviceList.push(key); } this.$jlmap.updateShowStation(list); - this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); + this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap || {}); this.$jlmap.updatePicture(deviceList); this.$jlmap.updateTransform(picture.scaling, picture.origin); this.$store.dispatch('map/setShowCentralizedStationCode', this.centralizedStationMap[this.roleDeviceCode]); diff --git a/src/views/newMap/display/terminals/troDetailWork.vue b/src/views/newMap/display/terminals/troDetailWork.vue index b3e533f50..39aecdaa6 100644 --- a/src/views/newMap/display/terminals/troDetailWork.vue +++ b/src/views/newMap/display/terminals/troDetailWork.vue @@ -118,7 +118,7 @@ export default { list.push(this.mapDevice[key]); deviceList.push(key); } - this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); + this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap || {}); setTimeout(() => { this.$jlmap.updatePicture(deviceList); const trainingDetail = this.$store.state.trainingNew.trainingDetail; diff --git a/src/views/newMap/display/terminals/troWork.vue b/src/views/newMap/display/terminals/troWork.vue index 4bdbe10bb..4224380b0 100644 --- a/src/views/newMap/display/terminals/troWork.vue +++ b/src/views/newMap/display/terminals/troWork.vue @@ -48,7 +48,7 @@ export default { if (this.mapData && this.mapData.pictureList) { const picture = this.$store.state.map.map.pictureList.find(picture => picture.type === 'bigScreen'); if (picture) { - this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); + this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap || {}); const deviceList = []; const mapDevice = this.$store.state.map.mapDevice; for (const deviceCode in mapDevice) { diff --git a/src/views/newMap/mapDraftPicture/index.vue b/src/views/newMap/mapDraftPicture/index.vue index d896b8a9e..538b0554d 100644 --- a/src/views/newMap/mapDraftPicture/index.vue +++ b/src/views/newMap/mapDraftPicture/index.vue @@ -451,7 +451,7 @@ export default { this.$refs.mapOperate.pictureChanged(pictureName); const pictureModel = this.$store.state.map.map.pictureList.find(elem => elem.name == pictureName); const deviceMap = pictureModel ? pictureModel.deviceMap : {}; - this.$store.dispatch('map/setPictureDeviceMap', deviceMap); + this.$store.dispatch('map/setPictureDeviceMap', deviceMap || {}); const deviceList = []; const map = this.$store.state.map.map; const mapDevice = this.$store.state.map.mapDevice;