From 6b8bfffd2138e1678b84f4aab7762788b38ac445 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Fri, 27 Nov 2020 14:15:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=99=90=E9=80=9F?= =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/race_01/menus/menuSection.vue | 32 +++++++++---------- src/jmapNew/theme/race_01/operationConfig.js | 4 +-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/jmapNew/theme/race_01/menus/menuSection.vue b/src/jmapNew/theme/race_01/menus/menuSection.vue index 70ca6485b..77c371b76 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: [ @@ -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})=>{ diff --git a/src/jmapNew/theme/race_01/operationConfig.js b/src/jmapNew/theme/race_01/operationConfig.js index 2f5746222..a9b2ed823 100644 --- a/src/jmapNew/theme/race_01/operationConfig.js +++ b/src/jmapNew/theme/race_01/operationConfig.js @@ -297,7 +297,7 @@ export default { { deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' }, { deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确认】按钮' }, { deviceType: '03', orderNum: 5, operateCode: '4073', tip: '鼠标左键点击【确认1】按钮' }, - { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮' }, + { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮', val: '5' }, { deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' } ] }, @@ -316,7 +316,7 @@ export default { { deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' }, { deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确认】按钮' }, { deviceType: '03', orderNum: 5, operateCode: '4073', tip: '鼠标左键点击【确认1】按钮' }, - { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮' }, + { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮', val: '0' }, { deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' } ] }, From 76f9db3eb64321278a3f6a9d6182818303a9ed40 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 27 Nov 2020 09:55:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=95=99=E8=A8=80=E6=9D=BF=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=87=B3=E6=96=B0=E6=A0=87=E7=AD=BE=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit a509af1e096bddf13d80cd12f63c67b2de2cafc5) --- src/router/index_Common.js | 6 ++ .../index.vue} | 66 +++++++++++-------- src/views/newMap/displayNew/demonMenu.vue | 15 +++-- 3 files changed, 53 insertions(+), 34 deletions(-) rename src/views/{newMap/displayNew/demon/messageBoard.vue => messageBoard/index.vue} (93%) diff --git a/src/router/index_Common.js b/src/router/index_Common.js index 1dbdb7412..84464aed4 100644 --- a/src/router/index_Common.js +++ b/src/router/index_Common.js @@ -133,6 +133,7 @@ const CompanyManage = () => import('@/views/system/companyManage/index'); const QuestionsRuleManage = () => import('@/views/system/questionsRuleManage/index'); const PreTheoryImport = () => import('@/views/competitionManage/bankList/preImport'); const PlanScheduleWicket = () => import('@/views/newMap/displayNew/demon/planSchedule'); +const MessageBoard = () => import('@/views/messageBoard/index'); // import { GenerateRouteProjectList } from '@/scripts/ProjectConfig'; // import { getSessionStorage } from '@/utils/auth'; @@ -404,6 +405,11 @@ export const publicAsyncRoute = [ path: '/practiceDisplay', component: PracticeDisplay, hidden: true + }, + { + path: '/messageBoard', + component: MessageBoard, + hidden: true } ]; // 城市轨道项目 diff --git a/src/views/newMap/displayNew/demon/messageBoard.vue b/src/views/messageBoard/index.vue similarity index 93% rename from src/views/newMap/displayNew/demon/messageBoard.vue rename to src/views/messageBoard/index.vue index 94e8d8ae8..df40da957 100644 --- a/src/views/newMap/displayNew/demon/messageBoard.vue +++ b/src/views/messageBoard/index.vue @@ -1,13 +1,15 @@