From ed6651cc4caa02dbd72707db612274f03db29aa9 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 16 Oct 2020 11:25:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A6=E5=8F=91=E6=95=85=E9=9A=9C=E8=8F=9C?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/en/menu.js | 1 + src/i18n/langs/zh/menu.js | 1 + .../theme/beijing_01/menus/menuSection.vue | 8 ++++++++ .../theme/beijing_01/menus/menuSignal.vue | 8 ++++++++ .../theme/beijing_01/menus/menuStation.vue | 8 ++++++++ .../theme/beijing_01/menus/menuStationStand.vue | 8 ++++++++ .../theme/beijing_01/menus/menuSwitch.vue | 8 ++++++++ .../theme/chengdu_01/menus/menuSection.vue | 8 ++++++++ .../theme/chengdu_01/menus/menuSignal.vue | 8 ++++++++ .../theme/chengdu_01/menus/menuStation.vue | 9 +++++++++ .../theme/chengdu_01/menus/menuStationStand.vue | 8 ++++++++ .../theme/chengdu_01/menus/menuSwitch.vue | 8 ++++++++ .../theme/chengdu_03/menus/menuSection.vue | 8 ++++++++ .../theme/chengdu_03/menus/menuSignal.vue | 9 ++++++++- .../theme/chengdu_03/menus/menuStation.vue | 9 +++++++++ .../theme/chengdu_03/menus/menuStationStand.vue | 8 ++++++++ .../theme/chengdu_03/menus/menuSwitch.vue | 8 ++++++++ .../theme/foshan_01/menus/menuSection.vue | 8 ++++++++ src/jmapNew/theme/foshan_01/menus/menuSignal.vue | 9 ++++++++- .../theme/foshan_01/menus/menuStation.vue | 9 +++++++++ .../theme/foshan_01/menus/menuStationStand.vue | 8 ++++++++ src/jmapNew/theme/foshan_01/menus/menuSwitch.vue | 8 ++++++++ .../theme/fuzhou_01/menus/menuSection.vue | 8 ++++++++ src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue | 8 ++++++++ .../theme/fuzhou_01/menus/menuStation.vue | 8 ++++++++ .../theme/fuzhou_01/menus/menuStationStand.vue | 8 ++++++++ src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue | 8 ++++++++ .../theme/ningbo_01/menus/menuSection.vue | 8 ++++++++ src/jmapNew/theme/ningbo_01/menus/menuSignal.vue | 8 ++++++++ .../theme/ningbo_01/menus/menuStation.vue | 8 ++++++++ .../theme/ningbo_01/menus/menuStationStand.vue | 8 ++++++++ src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue | 8 ++++++++ src/jmapNew/theme/xian_01/menus/menuSection.vue | 8 ++++++++ src/jmapNew/theme/xian_01/menus/menuSignal.vue | 8 ++++++++ src/jmapNew/theme/xian_01/menus/menuStation.vue | 8 ++++++++ .../theme/xian_01/menus/menuStationStand.vue | 8 ++++++++ src/jmapNew/theme/xian_01/menus/menuSwitch.vue | 8 ++++++++ src/jmapNew/theme/xian_02/menus/menuSection.vue | 8 ++++++++ src/jmapNew/theme/xian_02/menus/menuSignal.vue | 16 ++++++++++++---- src/jmapNew/theme/xian_02/menus/menuStation.vue | 8 ++++++++ src/jmapNew/theme/xian_02/menus/menuSwitch.vue | 8 ++++++++ .../theme/xian_02/menus/popStationStand.vue | 8 ++++++++ 42 files changed, 329 insertions(+), 6 deletions(-) diff --git a/src/i18n/langs/en/menu.js b/src/i18n/langs/en/menu.js index 731228937..ec091f261 100644 --- a/src/i18n/langs/en/menu.js +++ b/src/i18n/langs/en/menu.js @@ -44,6 +44,7 @@ export default { createTrain: 'Create Train', setFault: 'Set Fault', cancelFault: 'Cancel Fault', + triggerFaultManagement: 'Trigger fault management', orbitalSectionActive: 'Orbital section active', orbitalSectionResection: 'Orbital section resection' }, diff --git a/src/i18n/langs/zh/menu.js b/src/i18n/langs/zh/menu.js index 4a1670e68..49eedd6b7 100644 --- a/src/i18n/langs/zh/menu.js +++ b/src/i18n/langs/zh/menu.js @@ -44,6 +44,7 @@ export default { createTrain: '新建列车', setFault: '设置故障', cancelFault: '取消故障', + triggerFaultManagement: '触发故障管理', orbitalSectionActive: '轨道区段激活', orbitalSectionResection: '轨道区段切除' }, diff --git a/src/jmapNew/theme/beijing_01/menus/menuSection.vue b/src/jmapNew/theme/beijing_01/menus/menuSection.vue index 67f8d80bd..fa2ef6ef8 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuSection.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuSection.vue @@ -87,6 +87,11 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -282,6 +287,9 @@ export default { this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/beijing_01/menus/menuSignal.vue b/src/jmapNew/theme/beijing_01/menus/menuSignal.vue index b0f9ea23a..8b63b780d 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuSignal.vue @@ -103,6 +103,11 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -426,6 +431,9 @@ export default { }).catch(() => { this.$refs.noticeInfo.doShow(operate); }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/beijing_01/menus/menuStation.vue b/src/jmapNew/theme/beijing_01/menus/menuStation.vue index 76326273d..595630474 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuStation.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuStation.vue @@ -106,6 +106,11 @@ export default { label: '取消ZC故障', handler: this.cancelStoppage, cmdType: CMD.Station.CMD_STATION_REMOVE_FAULT + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -267,6 +272,9 @@ export default { this.$refs.stationSetRouteControlAll.doShow(operate, this.selected); } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue b/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue index 20c59a15c..2e24b5e2e 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue @@ -122,6 +122,11 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Stand.CMD_STAND_REMOVE_FAULT + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -315,6 +320,9 @@ export default { this.$refs.standDetail.doShow(operate, this.selected, []); } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue b/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue index eda20ad6d..bd29fecd4 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue @@ -98,6 +98,11 @@ export default { { label: '取消故障', handler: this.cancelStoppage + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -302,6 +307,9 @@ export default { callback: action => { } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSection.vue b/src/jmapNew/theme/chengdu_01/menus/menuSection.vue index 0505e1ba1..0dfa44083 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuSection.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuSection.vue @@ -78,6 +78,11 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -250,6 +255,9 @@ export default { callback: action => { } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue index 5428d9abe..a69e68393 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue @@ -179,6 +179,11 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -431,6 +436,9 @@ export default { createDeviceLabel() { this.doClose(); this.$refs.createDeviceLabel.doShow(); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/chengdu_01/menus/menuStation.vue b/src/jmapNew/theme/chengdu_01/menus/menuStation.vue index fe3f61fff..756500d42 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuStation.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuStation.vue @@ -15,6 +15,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault'; import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; +import CMD from '@/scripts/cmdPlugin/CommandEnum'; export default { name: 'StationMenu', @@ -51,6 +52,11 @@ export default { { label: '取消ZC故障', handler: this.cancelStoppage + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -115,6 +121,9 @@ export default { this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue b/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue index 8f93ef4bb..cf99d29d7 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue @@ -88,6 +88,11 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Stand.CMD_STAND_REMOVE_FAULT + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -214,6 +219,9 @@ export default { }).catch(() => { this.$refs.noticeInfo.doShow(step); }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue b/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue index 4af690f3b..59767b4db 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue @@ -129,6 +129,11 @@ export default { { label: '取消故障', handler: this.cancelStoppage + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -286,6 +291,9 @@ export default { }, createDeviceLabel() { this.$refs.createDeviceLabel.doShow(); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSection.vue b/src/jmapNew/theme/chengdu_03/menus/menuSection.vue index fc999e07c..793c7d90d 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuSection.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuSection.vue @@ -76,6 +76,11 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -203,6 +208,9 @@ export default { this.$refs.trainAddPlan.doShow(operate); } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue b/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue index 33f3c6e11..9baaf3e24 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue @@ -154,6 +154,11 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -338,7 +343,9 @@ export default { } } }); - + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/chengdu_03/menus/menuStation.vue b/src/jmapNew/theme/chengdu_03/menus/menuStation.vue index d66dc9fa0..9ad0f7c26 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuStation.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuStation.vue @@ -15,6 +15,7 @@ import { mapGetters } from 'vuex'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault'; import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; +import CMD from '@/scripts/cmdPlugin/CommandEnum'; export default { name: 'StationMenu', @@ -51,6 +52,11 @@ export default { { label: '取消ZC故障', handler: this.cancelStoppage + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -116,6 +122,9 @@ export default { this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue b/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue index d48054422..2afed3890 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue @@ -101,6 +101,11 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Stand.CMD_STAND_REMOVE_FAULT + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -223,6 +228,9 @@ export default { this.$refs.standDetail.doShow(operate, this.selected, []); } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue b/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue index a69c7dd8d..47a5350c2 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue @@ -101,6 +101,11 @@ export default { { label: '取消故障', handler: this.cancelStoppage + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -251,6 +256,9 @@ export default { callback: action => { } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/foshan_01/menus/menuSection.vue b/src/jmapNew/theme/foshan_01/menus/menuSection.vue index 502167241..ead4076d8 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuSection.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuSection.vue @@ -110,6 +110,11 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -231,6 +236,9 @@ export default { this.$refs.allLineCancelLimit.doShow(operate, this.selected); } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/foshan_01/menus/menuSignal.vue b/src/jmapNew/theme/foshan_01/menus/menuSignal.vue index bc78e33a5..72154e0c9 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuSignal.vue @@ -24,7 +24,6 @@ import RouteHandControl from '@/jmapNew/theme/components/menus/dialog/routeHandC import RouterCommand from './dialog/routerCommand'; import RouteDetail from '@/jmapNew/theme/components/menus/dialog/routeDetail'; import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'; - import CMD from '@/scripts/cmdPlugin/CommandEnum'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; import { mapGetters } from 'vuex'; @@ -176,6 +175,11 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -443,6 +447,9 @@ export default { } }); return routes; + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/foshan_01/menus/menuStation.vue b/src/jmapNew/theme/foshan_01/menus/menuStation.vue index 3046caa25..d952521e2 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuStation.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuStation.vue @@ -20,6 +20,7 @@ import { OperateMode } from '@/scripts/ConstDic'; import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault'; import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic'; import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; +import CMD from '@/scripts/cmdPlugin/CommandEnum'; export default { name: 'StationMenu', @@ -84,6 +85,11 @@ export default { { label: '取消ZC故障', handler: this.cancelStoppage + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -250,6 +256,9 @@ export default { this.$refs.stationSetRouteControlAll.doShow(operate, this.selected); } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue b/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue index 8ffcd8bd8..df6f552e9 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue @@ -149,6 +149,11 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType:CMD.Stand.CMD_STAND_REMOVE_FAULT + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -294,6 +299,9 @@ export default { this.$refs.standDetail.doShow(operate, this.selected); } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue b/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue index 441435971..7df37b64f 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue @@ -126,6 +126,11 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -389,6 +394,9 @@ export default { this.$refs.allLineCancelLimit.doShow(operate, this.selected); } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue index 4b467f3bd..669463855 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue @@ -145,6 +145,11 @@ export default { label: this.$t('menu.menuSection.cancelFault'), handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT + }, + { + label: this.$t('menu.menuSection.triggerFaultManagement'), + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -302,6 +307,9 @@ export default { this.$refs.speedCmdControl.doShow(operate, this.selected); } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue index 7a89cac95..59f2696fd 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue @@ -198,6 +198,11 @@ export default { label: this.$t('menu.menuSignal.cancelFault'), handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT + }, + { + label: this.$t('menu.menuSection.triggerFaultManagement'), + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -389,6 +394,9 @@ export default { this.$refs.routeDetail.doShow(operate, this.selected, this.getRouteList(this.selected)); } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuStation.vue b/src/jmapNew/theme/fuzhou_01/menus/menuStation.vue index 79d195383..e60ec88c2 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuStation.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuStation.vue @@ -103,6 +103,11 @@ export default { label: this.$t('menu.menuStation.cancelStoppage'), handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT + }, + { + label: this.$t('menu.menuSection.triggerFaultManagement'), + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -217,6 +222,9 @@ export default { this.$refs.stationSetRouteControlAll.doShow(operate, this.selected); } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue b/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue index b2e8c2573..dba1b0dc6 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue @@ -148,6 +148,11 @@ export default { label: this.$t('menu.menuStationStand.cancelFault'), handler: this.cancelStoppage, cmdType:CMD.Stand.CMD_STAND_REMOVE_FAULT + }, + { + label: this.$t('menu.menuSection.triggerFaultManagement'), + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -307,6 +312,9 @@ export default { this.$refs.standDetail.doShow(operate, this.selected); } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue index 4ed8de614..451147651 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue @@ -167,6 +167,11 @@ export default { { label: this.$t('menu.menuSwitch.cancelFault'), handler: this.cancelStoppage + }, + { + label: this.$t('menu.menuSection.triggerFaultManagement'), + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -343,6 +348,9 @@ export default { // 道岔钩锁 hookLock() { this.$refs.switchHookLock.doShow(this.selected); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSection.vue b/src/jmapNew/theme/ningbo_01/menus/menuSection.vue index f41df702d..3a924be67 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuSection.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuSection.vue @@ -115,6 +115,11 @@ export default { label: this.$t('menu.menuSection.cancelFault'), handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -280,6 +285,9 @@ export default { this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue index 713dcd76e..34bb5e4e2 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue @@ -173,6 +173,11 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -357,6 +362,9 @@ export default { this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStation.vue b/src/jmapNew/theme/ningbo_01/menus/menuStation.vue index d31c404a0..f57c1d652 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuStation.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuStation.vue @@ -95,6 +95,11 @@ export default { label: '取消ZC故障', handler: this.cancelStoppage, cmdType: CMD.Station.CMD_STATION_REMOVE_FAULT + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -212,6 +217,9 @@ export default { callback: action => { } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue index 89a19f5cf..5351e65fb 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue @@ -148,6 +148,11 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType:CMD.Stand.CMD_STAND_REMOVE_FAULT + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -309,6 +314,9 @@ export default { this.$refs.standDetail.doShow(operate, this.selected); } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue index 7f153a998..2ff620c8f 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue @@ -145,6 +145,11 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -309,6 +314,9 @@ export default { // 道岔钩锁 hookLock() { this.$refs.switchHookLock.doShow(this.selected); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/xian_01/menus/menuSection.vue b/src/jmapNew/theme/xian_01/menus/menuSection.vue index 10b83fada..d423fca7f 100644 --- a/src/jmapNew/theme/xian_01/menus/menuSection.vue +++ b/src/jmapNew/theme/xian_01/menus/menuSection.vue @@ -123,6 +123,11 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -263,6 +268,9 @@ export default { this.$refs.speedCmdControl.doShow(operate, this.selected); } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/xian_01/menus/menuSignal.vue b/src/jmapNew/theme/xian_01/menus/menuSignal.vue index 9aec59735..01fdc994f 100644 --- a/src/jmapNew/theme/xian_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/xian_01/menus/menuSignal.vue @@ -188,6 +188,11 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -379,6 +384,9 @@ export default { this.$refs.routeDetail.doShow(operate, this.selected, this.getRouteList(this.selected)); } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/xian_01/menus/menuStation.vue b/src/jmapNew/theme/xian_01/menus/menuStation.vue index 876168d2d..498ce63cf 100644 --- a/src/jmapNew/theme/xian_01/menus/menuStation.vue +++ b/src/jmapNew/theme/xian_01/menus/menuStation.vue @@ -105,6 +105,11 @@ export default { label: '取消ZC故障', handler: this.cancelStoppage, cmdType: CMD.Station.CMD_STATION_REMOVE_FAULT + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -226,6 +231,9 @@ export default { callback: action => { } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/xian_01/menus/menuStationStand.vue b/src/jmapNew/theme/xian_01/menus/menuStationStand.vue index 34d0f3580..b816fc2e5 100644 --- a/src/jmapNew/theme/xian_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/xian_01/menus/menuStationStand.vue @@ -136,6 +136,11 @@ export default { { label: '取消故障', handler: this.cancelStoppage + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -292,6 +297,9 @@ export default { this.$refs.standDetail.doShow(operate, this.selected); } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/xian_01/menus/menuSwitch.vue b/src/jmapNew/theme/xian_01/menus/menuSwitch.vue index c82843d3d..166f6c2fb 100644 --- a/src/jmapNew/theme/xian_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/xian_01/menus/menuSwitch.vue @@ -165,6 +165,11 @@ export default { { label: '取消故障', handler: this.cancelStoppage + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ], menuDirective: [ @@ -334,6 +339,9 @@ export default { // 道岔钩锁 hookLock() { this.$refs.switchHookLock.doShow(this.selected); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/xian_02/menus/menuSection.vue b/src/jmapNew/theme/xian_02/menus/menuSection.vue index 5c2d86a09..1fda1839a 100644 --- a/src/jmapNew/theme/xian_02/menus/menuSection.vue +++ b/src/jmapNew/theme/xian_02/menus/menuSection.vue @@ -127,6 +127,11 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -282,6 +287,9 @@ export default { callback: action => { } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/xian_02/menus/menuSignal.vue b/src/jmapNew/theme/xian_02/menus/menuSignal.vue index f357f763a..ebe27fe77 100644 --- a/src/jmapNew/theme/xian_02/menus/menuSignal.vue +++ b/src/jmapNew/theme/xian_02/menus/menuSignal.vue @@ -192,6 +192,11 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -286,7 +291,7 @@ export default { // 排列进路 arrangementRoute() { let step = ''; - let routeCode = ''; + let routeCode = ''; if (this.selected.isTerminalSignal) { const endSignalRouteList = this.$store.state.menuOperation.endSignalRouteList; endSignalRouteList.forEach(item => { @@ -313,14 +318,14 @@ export default { this.resetRouteSignal(); const updateDeviceList = []; updateDeviceList.push({code: this.selected.code, _type: 'Signal', isStartSignal: 1}); - const endSignalRouteList = []; + const endSignalRouteList = []; this.routeList.forEach(item => { if (item.startSignalCode === this.selected.code) { endSignalRouteList.push({endButtonSignalCode: item.endButtonSignalCode, routeCode: item.code}); updateDeviceList.push({code: item.endButtonSignalCode, _type: 'Signal', isTerminalSignal: 1}); } }); - this.$store.dispatch('menuOperation/setRouteSelectStartSignal', {startSignalCode: this.selected.code, endSignalRouteList: endSignalRouteList}); + this.$store.dispatch('menuOperation/setRouteSelectStartSignal', {startSignalCode: this.selected.code, endSignalRouteList: endSignalRouteList}); this.$store.dispatch('training/updateMapState', updateDeviceList); } this.$store.dispatch('training/nextNew', step).then(({ valid }) => { @@ -527,7 +532,7 @@ export default { endSignalRouteList.forEach(item => { updateDeviceList.push({code: item.endButtonSignalCode, _type: 'Signal', isTerminalSignal: 0}); }); - this.$store.dispatch('menuOperation/setRouteSelectStartSignal', { startSignalCode: '', endSignalRouteList: [] }); + this.$store.dispatch('menuOperation/setRouteSelectStartSignal', { startSignalCode: '', endSignalRouteList: [] }); this.$store.dispatch('training/updateMapState', updateDeviceList); }, enabledConfirm() { @@ -558,6 +563,9 @@ export default { if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) { this.$refs.popMenu.resetShowPosition(point); } + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/xian_02/menus/menuStation.vue b/src/jmapNew/theme/xian_02/menus/menuStation.vue index 6694838bb..0015be06b 100644 --- a/src/jmapNew/theme/xian_02/menus/menuStation.vue +++ b/src/jmapNew/theme/xian_02/menus/menuStation.vue @@ -151,6 +151,11 @@ export default { { label: '取消ZC故障', handler: this.cancelStoppage + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -323,6 +328,9 @@ export default { callback: action => { } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue index 27fb6f6a8..9379c8b3d 100644 --- a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue +++ b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue @@ -154,6 +154,11 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -341,6 +346,9 @@ export default { callback: action => { } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/xian_02/menus/popStationStand.vue b/src/jmapNew/theme/xian_02/menus/popStationStand.vue index af805793f..2d697ae75 100644 --- a/src/jmapNew/theme/xian_02/menus/popStationStand.vue +++ b/src/jmapNew/theme/xian_02/menus/popStationStand.vue @@ -196,6 +196,11 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT + }, + { + label: '触发故障管理', + handler: this.triggerFaultManagement, + cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -450,6 +455,9 @@ export default { this.$refs.stopProfile.doShow(step, this.selected, 'down'); } }); + }, + triggerFaultManagement() { + this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } };