diff --git a/src/jmapNew/theme/xian_02/menus/menuSignal.vue b/src/jmapNew/theme/xian_02/menus/menuSignal.vue index 0e58b33f5..28aa72961 100644 --- a/src/jmapNew/theme/xian_02/menus/menuSignal.vue +++ b/src/jmapNew/theme/xian_02/menus/menuSignal.vue @@ -54,13 +54,13 @@ export default { }, { label: '开放自动进路', - handler: this.atsAutoControl, - cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING + handler: this.setAutoInterlock, + cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO }, { label: '关闭自动进路', - handler: this.humanControl, - cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING + handler: this.cancelAutoInterlock, + cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO }, { label: '终端信号封锁', @@ -117,13 +117,13 @@ export default { }, { label: '开放自动进路', - handler: this.atsAutoControl, - cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING + handler: this.setAutoInterlock, + cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO }, { label: '关闭自动进路', - handler: this.humanControl, - cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING + handler: this.cancelAutoInterlock, + cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO }, { label: '终端信号封锁', @@ -451,20 +451,13 @@ export default { this.$refs.noticeInfo.doShow(); }); }, - // 进路交人工控 - humanControl() { - const routeCodeList = []; - this.routeList.forEach(item => { - if (item.startSignalCode === this.selected.code) { - routeCodeList.push(item.code); - } - }); + // 取消联锁自动进路 + cancelAutoInterlock() { const step = { code: `${this.selected.code}`, - operation: OperationEvent.Signal.humanControl.menu.operation, + operation: OperationEvent.Signal.cancelAutoInterlock.menu.operation, param: { - signalCode: this.selected.code, - routeCodeList: routeCodeList + signalCode: this.selected.code } }; this.$store.dispatch('training/nextNew', step).then(({ valid }) => { @@ -473,7 +466,7 @@ export default { this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: { code: OperationEvent.Command.commandXian.confirm.operation, name: '关闭自动进路'}, - cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING, + cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO, param: step.param }); } else { @@ -483,20 +476,13 @@ export default { this.$refs.noticeInfo.doShow(); }); }, - // 进路交自动控 - atsAutoControl() { - const routeCodeList = []; - this.routeList.forEach(item => { - if (item.startSignalCode === this.selected.code) { - routeCodeList.push(item.code); - } - }); + // 设置联锁自动进路 + setAutoInterlock() { const step = { code: `${this.selected.code}`, - operation: OperationEvent.Signal.atsAutoControl.menu.operation, + operation: OperationEvent.Signal.setAutoInterlock.menu.operation, param: { - signalCode: this.selected.code, - routeCodeList: routeCodeList + signalCode: this.selected.code } }; this.$store.dispatch('training/nextNew', step).then(({ valid }) => { @@ -505,7 +491,7 @@ export default { this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: { code: OperationEvent.Command.commandXian.confirm.operation, name: '开放自动进路'}, - cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING, + cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO, param: step.param }); } else {