From 162bd4c9f217c3d238af3d9a4502dbfb07c10882 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 10 Apr 2020 10:16:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E4=B8=80=E5=8F=B7=E7=BA=BF:?= =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E9=97=AE=E9=A2=98=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ningbo_01/menus/dialog/routeSelection.vue | 2 +- .../ningbo_01/menus/dialog/standRunLevel.vue | 4 +- src/jmapNew/theme/ningbo_01/menus/index.vue | 16 +- .../ningbo_01/menus/passiveDialog/alarm.vue | 382 +++++++++--------- .../ningbo_01/menus/passiveDialog/timeout.vue | 200 ++++----- .../theme/ningbo_01/operationConfig.js | 4 +- 6 files changed, 311 insertions(+), 297 deletions(-) diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue index 6073486a3..1a9387fde 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue @@ -18,7 +18,7 @@ - + diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/standRunLevel.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/standRunLevel.vue index 1fe8519b6..96c5b546f 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/standRunLevel.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/standRunLevel.vue @@ -293,10 +293,10 @@ export default { if (valid) { this.doClose(); } - }).catch((error) => { + }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow({}, error.message); + // this.$refs.noticeInfo.doShow({}, error.message); }); } else { this.doClose(); diff --git a/src/jmapNew/theme/ningbo_01/menus/index.vue b/src/jmapNew/theme/ningbo_01/menus/index.vue index 42ebb5c39..b2fec6082 100644 --- a/src/jmapNew/theme/ningbo_01/menus/index.vue +++ b/src/jmapNew/theme/ningbo_01/menus/index.vue @@ -13,9 +13,9 @@ - + - + @@ -34,9 +34,9 @@ import MenuTrain from './menuTrain'; import MenuStation from './menuStation'; import MenuBar from './menuBar'; import MenuLimit from './menuLimit'; -import PassiveAlarm from './passiveDialog/alarm'; +// import PassiveAlarm from './passiveDialog/alarm'; import PassiveContorl from './passiveDialog/control'; -import PassiveTimeout from './passiveDialog/timeout'; +// import PassiveTimeout from './passiveDialog/timeout'; export default { name: 'Menus', @@ -53,9 +53,9 @@ export default { MenuStation, MenuTrain, MenuLimit, - PassiveAlarm, - PassiveContorl, - PassiveTimeout + // PassiveAlarm, + PassiveContorl + // PassiveTimeout }, props: { selected: { @@ -113,7 +113,7 @@ export default { .ningbo-01__systerm .el-dialog { background: rgba(100, 100, 100, 0.3); - border: 2px solid rgb(144, 144, 144, 0.8); + border: 2px solid rgba(144, 144, 144, 0.8); border-radius: 6px; color: #000; font-size: 14px; diff --git a/src/jmapNew/theme/ningbo_01/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/ningbo_01/menus/passiveDialog/alarm.vue index 3fb293056..2e98c6476 100644 --- a/src/jmapNew/theme/ningbo_01/menus/passiveDialog/alarm.vue +++ b/src/jmapNew/theme/ningbo_01/menus/passiveDialog/alarm.vue @@ -1,207 +1,213 @@ \ No newline at end of file + diff --git a/src/jmapNew/theme/ningbo_01/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/ningbo_01/menus/passiveDialog/timeout.vue index 448e6b232..40a2936a9 100644 --- a/src/jmapNew/theme/ningbo_01/menus/passiveDialog/timeout.vue +++ b/src/jmapNew/theme/ningbo_01/menus/passiveDialog/timeout.vue @@ -1,106 +1,114 @@ \ No newline at end of file + this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + if (valid) { + this.doClose(); + } + }); + }, + commit() { + const operate = { + type: this.operate.type, + operation: OperationEvent.Command.close.notice.operation + }; + this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + if (valid) { + this.doClose(); + } + }); + }, + isClose() { + return this.dialogShow; + } + } +}; + + diff --git a/src/jmapNew/theme/ningbo_01/operationConfig.js b/src/jmapNew/theme/ningbo_01/operationConfig.js index 5f52f4c9d..a4fb6942d 100644 --- a/src/jmapNew/theme/ningbo_01/operationConfig.js +++ b/src/jmapNew/theme/ningbo_01/operationConfig.js @@ -292,12 +292,12 @@ export default { operateType: 'Section_Set_Limit_Speed', skinCode: '06', trainingName: '设置临时限速({8}{9})', - trainingRemark: '设置临时限速功能(限速值:自动)', + trainingRemark: '设置临时限速功能(限速值:不限速)', trainingType: 'Section', productTypes: ['02'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【设置临时限速】' }, - { deviceType: '03', orderNum: 2, operateCode: '4076', tip: '鼠标左键选择【限速值自动】', val: '0' }, + { deviceType: '03', orderNum: 2, operateCode: '4076', tip: '鼠标左键选择【不限速】', val: '0' }, { deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' }, { deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确认】按钮' }, { deviceType: '03', orderNum: 5, operateCode: '4073', tip: '鼠标左键点击【确认1】按钮' },