From 5a7c5fdbebe96d274a88c973caef8e076732d29d Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Sun, 29 Sep 2024 11:12:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=88=90=E9=83=BD=E4=B8=89=E5=8F=B7?= =?UTF-8?q?=E7=BA=BF=E6=8A=98=E8=BF=94=E8=BF=9B=E8=B7=AF=E5=8A=9E=E7=90=86?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/chengdu_03/menus/menuButton.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue index a81146ad8..62e77beb5 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue @@ -572,7 +572,8 @@ export default { }; let flag = false; this.routeList.forEach(item => { - if (item.startSignalCode === deviceList[0].code && item.endSignalCode === deviceList[1].code) { + const endSignalCode = item.endButtonSignalCode || item.endSignalCode; + if (item.startSignalCode === deviceList[0].code && endSignalCode === deviceList[1].code) { operate.param = {routeCode: item.code, signalCode: deviceList[0].code}; this.deviceList = []; flag = true; From 92c66ab4d6bd1428eb4941d6e83a6fd64b23d167 Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Sun, 29 Sep 2024 14:07:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=94=BB=E9=9D=A2=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A4=84=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; From 0d34d83747fd7e25feb347620a4bd4155aa40fcd Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Mon, 30 Sep 2024 14:33:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=8E=B0=E5=9C=B0=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E7=AB=99=E6=B7=BB=E5=8A=A0=E8=BF=90=E8=A1=8C=E5=9B=BE=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/display/terminals/terminalMenu.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/newMap/display/terminals/terminalMenu.vue b/src/views/newMap/display/terminals/terminalMenu.vue index 8ffeb03b4..0f8111f8a 100644 --- a/src/views/newMap/display/terminals/terminalMenu.vue +++ b/src/views/newMap/display/terminals/terminalMenu.vue @@ -106,7 +106,7 @@ export default { dispatchingCommand: ['DISPATCHER'], trainTicket: ['STATION_SUPERVISOR', 'STATION_ASSISTANT', 'DRIVER'], registerBook: ['STATION_SUPERVISOR', 'STATION_MASTER', 'STATION_WORKER', 'ELECTRIC_DISPATCHER', 'STATION_ELECTRIC_WORKER'], - diagramLoad: ['DISPATCHER'], + diagramLoad: ['DISPATCHER', 'STATION_SUPERVISOR'], driverAtsWork: ['DRIVER'], diagramPreview: ['DISPATCHER', 'STATION_SUPERVISOR', 'DRIVER', 'NCC_DISPATCHER'], diagramEdit: [], From c8a49e3d31087f4b21edb9ea7e9e795cc3d981f9 Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Sat, 12 Oct 2024 17:38:30 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BA=BF=E8=B7=AF?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/configLine/config.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/system/configLine/config.vue b/src/views/system/configLine/config.vue index dd15ebfc0..6d6b5731d 100644 --- a/src/views/system/configLine/config.vue +++ b/src/views/system/configLine/config.vue @@ -120,7 +120,8 @@ export default { 'SFUCanOnlyApplyForFaultLockSection', 'signalBolckOptReflectSignal', 'routeCanSetWhenSwitchFault', - 'manualTrainDefaultStop' + 'manualTrainDefaultStop', + 'guideDelayCloseWhenFirstSectionOccupied' ], selectList: ['runMode', 'singleApproachLockCancelRoute'], generalConfig: [ @@ -174,7 +175,8 @@ export default { 'SFUCanOnlyApplyForFaultLockSection', 'signalBolckOptReflectSignal', 'routeCanSetWhenSwitchFault', - 'manualTrainDefaultStop' + 'manualTrainDefaultStop', + 'guideDelayCloseWhenFirstSectionOccupied' ], rangeList: ['noParkingSM', 'parkingSM'], speedList: ['rmAtpSpeed', 'urmAtpSpeed'], @@ -234,7 +236,8 @@ export default { SFUCanOnlyApplyForFaultLockSection: '区故解只能应用于故障锁闭区段', signalBolckOptReflectSignal:'对信号机封锁操作，是否影响信号显示', routeCanSetWhenSwitchFault: '道岔故障时可以办理进路（由远及近锁闭，到故障处终止）', - manualTrainDefaultStop: '人工驾驶模式（CM/RM/NRM）下的列车默认是停车等待命令状态' + manualTrainDefaultStop: '人工驾驶模式（CM/RM/NRM）下的列车默认是停车等待命令状态', + guideDelayCloseWhenFirstSectionOccupied: '办理引导进路时，如果进路首区段占用，引导信号15秒后关闭' } }; },