From dc12bd3f881e6a3234b89fdee09c89d64a3d0732 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 5 Mar 2020 13:40:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E9=83=BD=E4=B8=80=E5=8F=B7=E7=BA=BF?= =?UTF-8?q?=20=E4=BF=A1=E5=8F=B7=E6=9C=BA=20=E4=BF=A1=E5=8F=B7=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E9=80=9A=E8=BF=87=20=E4=BB=A3=E7=A0=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4=20=E8=87=AA=E5=8A=A8=E9=80=9A=E8=BF=87=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E8=87=AA=E5=8A=A8=E8=A7=A6=E5=8F=91=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=20=E7=8A=B6=E6=80=81=E5=8F=82=E6=95=B0=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/chengdu_01/menus/menuSignal.vue | 76 ++++++------------- src/scripts/translate.js | 4 +- .../dataRelation/routeoperate/route.vue | 12 +-- .../dataRelation/routeoperate/route.vue | 12 +-- 4 files changed, 36 insertions(+), 68 deletions(-) diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue index 86783b790..d59afe815 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue @@ -113,13 +113,13 @@ export default { }, { label: '开放自动进路', - handler: this.atsAutoControl, - cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING + handler: this.singalPassModel, + cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO }, { label: '关闭自动进路', - handler: this.humanControl, - cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING + handler: this.singalCancelPassModel, + cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO }, { label: '终端信号封锁', @@ -404,69 +404,37 @@ export default { } }); }, - // 进路交人工控 - humanControl() { - const routes = []; - this.routeList.forEach(elem => { - if (elem.startSignalCode === this.selected.code) { - // routes.push(elem); - if (elem.atsControl == '1') { - routes.push(elem.code); - } - } - }); - if (routes.length <= 0) { - this.$refs.noticeInfo.doShow({}, ['所选的进路没有一个是人工的']); - return false; - } - const step = { + // 设置通过模式 + singalPassModel() { + const operate = { start: true, - over:true, - code: `${this.selected.code}`, - operation: OperationEvent.Signal.humanControl.menu.operation, + code: this.selected.code, + operation: OperationEvent.Signal.setAutoInterlock.menu.operation, param: { - signalCode: `${this.selected.code}`, - routeCodeList:routes - }, - // cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING + signalCode: `${this.selected.code}` + } }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: '关闭自动进路',cmdType:CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING}); + this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: { code: OperationEvent.Signal.setAutoInterlock.menu.operation, name: '开放自动进路', cmdType:CMD.Signal.CMD_SIGNAL_SET_CI_AUTO}}); } }); }, - // 进路交自动控 - atsAutoControl() { - const routes = []; - this.routeList.forEach(elem => { - if (elem.startSignalCode === this.selected.code) { - // routes.push(elem); - if (elem.atsControl == '0') { - routes.push(elem.code); - } - } - }); - if (routes.length <= 0) { - this.$refs.noticeInfo.doShow({}, ['所选的进路没有一个是自动的']); - return false; - } - const step = { + // 取消通过模式 + singalCancelPassModel() { + const operate = { start: true, - // over:true, - code: `${this.selected.code}`, - operation: OperationEvent.Signal.atsAutoControl.menu.operation, + code: this.selected.code, + operation: OperationEvent.Signal.cancelAutoInterlock.menu.operation, param: { - signalCode: `${this.selected.code}`, - routeCodeList:routes - }, - // cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING + signalCode: `${this.selected.code}` + } }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: { code: OperationEvent.Signal.atsAutoControl.menu.operation, name: '开放自动进路',cmdType:CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING}}); + this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: { code: OperationEvent.Signal.cancelAutoInterlock.menu.operation, name: '关闭自动进路', cmdType:CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO}}); } }); }, diff --git a/src/scripts/translate.js b/src/scripts/translate.js index c9ff3976f..8019f2ce7 100644 --- a/src/scripts/translate.js +++ b/src/scripts/translate.js @@ -101,8 +101,8 @@ export const translate = { { key: 'overlapSwitchCode', tHeader: '延续保护道岔ID', formatter: (val) => { return val || ''; } }, { key: 'overlapSwitchLocateType', tHeader: '延续保护道岔位置类型', formatter: (val) => { return val || ''; } }, { key: 'turnBackSectionCode', tHeader: '折返轨ID', formatter: (val) => { return val || ''; } }, - { key: 'arc', tHeader: '是否自动追踪/联锁自动触发', formatter: (val) => { return val || false; } }, - { key: 'flt', tHeader: '是否车队/联锁自动进路', formatter: (val) => { return val || false; } }, + { key: 'ciControl', tHeader: '是否自动追踪/联锁自动触发', formatter: (val) => { return val || false; } }, + { key: 'setFleetMode', tHeader: '是否车队/联锁自动进路', formatter: (val) => { return val || false; } }, { key: 'delayReleaseTime', tHeader: '延时解锁时间', formatter: (val) => { return val || 0; } } ] }, diff --git a/src/views/mapdraft/dataRelation/routeoperate/route.vue b/src/views/mapdraft/dataRelation/routeoperate/route.vue index 5e581e6e8..1ef7cc5bc 100644 --- a/src/views/mapdraft/dataRelation/routeoperate/route.vue +++ b/src/views/mapdraft/dataRelation/routeoperate/route.vue @@ -10,14 +10,14 @@ - - + + {{ $t('map.are') }} {{ $t('map.deny') }} - - + + {{ $t('map.are') }} {{ $t('map.deny') }} @@ -313,8 +313,8 @@ export default { code: '', name: '', // 名字 stationCode: '', // 所属站台 - arc: false, // 是否自动追踪/联锁自动触发 - flt: false, // 是否车队/联锁自动进路 + ciControl: false, // 是否自动追踪/联锁自动触发 + setFleetMode: false, // 是否车队/联锁自动进路 delayReleaseTime: '', // 延时解锁时间 turnBack: false, // 是否折返进路 startSignalCode: '', // 始端信号机 diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue index d4b028bf4..a497dd334 100644 --- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue +++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue @@ -10,14 +10,14 @@ - - + + {{ $t('map.are') }} {{ $t('map.deny') }} - - + + {{ $t('map.are') }} {{ $t('map.deny') }} @@ -250,8 +250,8 @@ export default { code: '', name: '', // 名字 stationCode: '', // 所属站台 - arc: false, // 是否自动追踪/联锁自动触发 - flt: false, // 是否车队/联锁自动进路 + ciControl: false, // 是否自动追踪/联锁自动触发 + setFleetMode: false, // 是否车队/联锁自动进路 lockFirst:false, // 是否先锁闭——办理过程直接先锁闭区段 delayReleaseTime: '', // 延时解锁时间 turnBack: false, // 是否折返进路