From 18b5688cdf090814db96d333bd59a34fe62f646b Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 5 Feb 2021 09:11:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9B=BD=E8=B5=9B=3D=E3=80=8B=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E4=B8=B4=E6=97=B6=E9=99=90=E9=80=9F=20=20=20=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/race_01/menus/menuSection.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/jmapNew/theme/race_01/menus/menuSection.vue b/src/jmapNew/theme/race_01/menus/menuSection.vue index 77c371b76..d86449b49 100644 --- a/src/jmapNew/theme/race_01/menus/menuSection.vue +++ b/src/jmapNew/theme/race_01/menus/menuSection.vue @@ -100,12 +100,12 @@ export default { label: '设置临时限速', handler: this.setSpeed, cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED + }, + { + label: '取消临时限速', + handler: this.cancelSpeed, + cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED } - // { - // label: '取消临时限速', - // handler: this.cancelSpeed, - // cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED - // } ] }, menuForce: [ From 3b0536704d89110105f3231f70eb57f500d41af7 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 5 Feb 2021 16:30:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=BD=E8=B5=9B=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=20=E5=8F=96=E6=B6=88=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E9=99=90=E9=80=9F=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/ningbo_01/menus/menuBar.vue | 38 ------------------- .../theme/race_01/menus/menuSection.vue | 22 +++++------ 2 files changed, 11 insertions(+), 49 deletions(-) diff --git a/src/jmapNew/theme/ningbo_01/menus/menuBar.vue b/src/jmapNew/theme/ningbo_01/menus/menuBar.vue index a58940c7c..3feacfaeb 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuBar.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuBar.vue @@ -299,44 +299,6 @@ export default { } ] }, - { - title: '车站定位', - operate: '', - children: [ - ] - }, - { - title: 'ATS终端操作', - operate: '', - children: [ - { - title: '当天运行车计划', - click: this.undeveloped - }, - { - title: '出入库预告', - click: this.undeveloped - } - ] - }, - { - title: '计划车操作', - operate: '', - children: [ - { - title: '添加计划车', - click: this.undeveloped - }, - { - title: '平移计划车', - click: this.undeveloped - }, - { - title: '删除计划车', - click: this.undeveloped - } - ] - }, { title: '批处理命令', operate: OperationEvent.Command.mBar.detainControl, diff --git a/src/jmapNew/theme/race_01/menus/menuSection.vue b/src/jmapNew/theme/race_01/menus/menuSection.vue index d86449b49..70ca6485b 100644 --- a/src/jmapNew/theme/race_01/menus/menuSection.vue +++ b/src/jmapNew/theme/race_01/menus/menuSection.vue @@ -293,17 +293,17 @@ export default { } }); }, - // cancelSpeed() { - // let sectionCode = this.selected.code; - // if (this.selected.type == '02' || this.selected.type == '03') { - // sectionCode = this.selected.parentCode; - // } - // commitOperate(menuOperate.Section.cancelSpeed, {sectionCode:sectionCode}).then(({valid, operate})=>{ - // if (valid) { - // this.$refs.speedLimitControl.doShow(operate, this.selected); - // } - // }); - // }, + cancelSpeed() { + let sectionCode = this.selected.code; + if (this.selected.type == '02' || this.selected.type == '03') { + sectionCode = this.selected.parentCode; + } + commitOperate(menuOperate.Section.cancelSpeed, {sectionCode:sectionCode}).then(({valid, operate})=>{ + if (valid) { + this.$refs.speedLimitControl.doShow(operate, this.selected); + } + }); + }, // 设置故障 setStoppage() { commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{