diff --git a/src/jmapNew/config/skinCode/nanjing_02.js b/src/jmapNew/config/skinCode/nanjing_02.js index 5cda4b08b..1112055f2 100644 --- a/src/jmapNew/config/skinCode/nanjing_02.js +++ b/src/jmapNew/config/skinCode/nanjing_02.js @@ -192,6 +192,7 @@ class SkinCode extends defaultStyle { closeSignalVerColor: '#FF1F10', // 关闭信号 灯柱竖柱颜色 level 1 guideSignalVerColor: '#FFFF00', // 引导信号控制级 灯柱竖柱颜色 level 2 autoRouteVerColor: '#9DFF6E', // 联锁自动进路颜色 + atpLevelColor: '#009600', // ATP级别灯柱颜色 standardVerticalShape: '8', // 灯柱 竖杆 8边型 standardLength: 12, // 高柱长度 standardHeight: 5, // 灯柱高度 diff --git a/src/jmapNew/shape/graph/Signal/index.js b/src/jmapNew/shape/graph/Signal/index.js index b74acd722..07899588e 100644 --- a/src/jmapNew/shape/graph/Signal/index.js +++ b/src/jmapNew/shape/graph/Signal/index.js @@ -1188,8 +1188,8 @@ class Signal extends Group { this.sigPost.setVerColor(this.style.Signal.post.closeSignalVerColor); } else if (model.level === 1 && this.style.Signal.post.guideSignalVerColor && !model.fleetMode) { this.sigPost.setVerColor(this.style.Signal.post.guideSignalVerColor); - } else if (model.level === 2 && this.style.Signal.post.autoRouteVerColor && !model.fleetMode) { - this.sigPost.setVerColor(this.style.Signal.post.autoRouteVerColor); + } else if (model.level === 2 && this.style.Signal.post.atpLevelColor && !model.fleetMode) { + this.sigPost.setVerColor(this.style.Signal.post.atpLevelColor); } if (this.style.Signal.lamp.special) { diff --git a/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenuButton.vue b/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenuButton.vue index 151d168cd..8f1143174 100644 --- a/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenuButton.vue +++ b/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenuButton.vue @@ -893,15 +893,10 @@ export default { this.$store.dispatch('trainingNew/next', step).then(({ valid }) => { if (valid) { - this.doClose(); - this.handleDeviceMenu(); - this.handleClose(); EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}成功`}); } }).catch((error) => { - this.doClose(); - this.handleDeviceMenu(); - this.handleClose(); + if (error && error.code == '10017') { EventBus.$emit('sendMsg', {message: error.message}); this.$refs.noticeInfo.doShow(error.message); @@ -910,6 +905,9 @@ export default { this.$refs.noticeInfo.doShow(`${this.commandInfo.name}失败`); } }); + this.doClose(); + this.handleDeviceMenu(); + this.handleClose(); }, handleRightClickClose() { this.rightClickDialogVisible = false; diff --git a/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue b/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue index ea192c4c3..3e67306f9 100644 --- a/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue +++ b/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue @@ -966,21 +966,18 @@ export default { this.$store.dispatch('trainingNew/next', step).then(({ valid }) => { if (valid) { - this.doClose(); - this.handleDeviceMenu(); - this.handleClose(); EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}成功`}); } }).catch((error) => { - this.doClose(); - this.handleDeviceMenu(); - this.handleClose(); if (error && error.code == '10017') { EventBus.$emit('sendMsg', {message: error.message}); } else { EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}失败`}); } }); + this.doClose(); + this.handleDeviceMenu(); + this.handleClose(); }, handleRightClickClose() { this.rightClickDialogVisible = false;