From 56f713a02b545da8fbd139bdc18b6f0dd80d3498 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Thu, 23 Apr 2020 10:29:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8A=A5=E9=94=99=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../childDialog/confirmControlSpeed.vue | 6 +- .../childDialog/confirmSignalUnlock.vue | 6 +- .../foshan_01/menus/dialog/trainAddPlan.vue | 36 +++++----- .../menus/dialog/trainDeletePlan.vue | 4 +- .../menus/dialog/trainMoveEvently.vue | 4 +- .../childDialog/twoConfirmation.vue | 2 +- .../menus/menuDialog/childDialog/userAdd.vue | 2 +- .../menuDialog/childDialog/userDelete.vue | 2 +- .../menus/menuDialog/childDialog/userEdit.vue | 2 +- .../menus/menuDialog/detainTrainContorl.vue | 2 +- .../menuDialog/detainTrainContorlUpDown.vue | 4 +- .../foshan_01/menus/menuDialog/helpAbout.vue | 4 +- .../foshan_01/menus/menuDialog/manageUser.vue | 14 ++-- .../menus/menuDialog/stationControl.vue | 3 - .../foshan_01/menus/menuDialog/trainAdd.vue | 4 +- .../menus/menuDialog/trainDelete.vue | 4 +- .../menus/menuDialog/trainTranstalet.vue | 4 +- .../foshan_01/menus/passiveDialog/control.vue | 4 +- .../haerbin_01/menus/dialog/trainInitPlan.vue | 70 ++++++++++--------- .../ningbo_01/menus/dialog/trainAddPlan.vue | 3 +- .../xian_02/menus/dialog/trainAddPlan.vue | 3 +- 21 files changed, 90 insertions(+), 93 deletions(-) diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmControlSpeed.vue b/src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmControlSpeed.vue index 39c6c2561..3e06d8f0b 100644 --- a/src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmControlSpeed.vue +++ b/src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmControlSpeed.vue @@ -128,7 +128,7 @@ export default { this.$emit('setOperate', { step: 1, success: true }); this.doClose(); } - }).catch((error) => { + }).catch(() => { this.loading = false; this.$emit('setOperate', { step: 0, success: false }); this.doClose(); @@ -147,9 +147,7 @@ export default { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.doClose(); } - }).catch(error => { - this.doClose(); - }); + }).catch(() => { this.doClose(); }); } } }; diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmSignalUnlock.vue b/src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmSignalUnlock.vue index 98076217d..4f3a929f7 100644 --- a/src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmSignalUnlock.vue +++ b/src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmSignalUnlock.vue @@ -94,7 +94,7 @@ export default { this.$emit('setOperate', { step: 1, success: true }); this.doClose(); } - }).catch((error) => { + }).catch(() => { this.loading = false; this.$emit('setOperate', { step: 0, success: false }); this.doClose(); @@ -112,9 +112,7 @@ export default { this.$emit('setOperate', { step: 0, success: false }); this.doClose(); } - }).catch(error => { - this.doClose(); - }); + }).catch(() => { this.doClose(); }); } } }; diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/trainAddPlan.vue b/src/jmapNew/theme/foshan_01/menus/dialog/trainAddPlan.vue index 4706cbd39..bae498bca 100644 --- a/src/jmapNew/theme/foshan_01/menus/dialog/trainAddPlan.vue +++ b/src/jmapNew/theme/foshan_01/menus/dialog/trainAddPlan.vue @@ -14,31 +14,31 @@
- - + + - + @@ -61,7 +61,6 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { getTripNumberList, getServiceNumbersByTripNum } from '@/api/simulation'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; - export default { // name: 'TrainMove', name: 'TrainAddPlan', @@ -155,7 +154,8 @@ export default { } }); }).catch(error => { - this.$messageBox(error.message); + console.log(error); + // this.$messageBox(error.message); }); this.dialogShow = true; this.$nextTick(function () { diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/trainDeletePlan.vue b/src/jmapNew/theme/foshan_01/menus/dialog/trainDeletePlan.vue index ec4fe34db..b7fa3c00f 100644 --- a/src/jmapNew/theme/foshan_01/menus/dialog/trainDeletePlan.vue +++ b/src/jmapNew/theme/foshan_01/menus/dialog/trainDeletePlan.vue @@ -124,7 +124,7 @@ export default { if (valid) { this.doClose(); } - }).catch(error => { + }).catch(() => { this.loading = false; this.doClose(); }); @@ -143,7 +143,7 @@ export default { if (valid) { this.doClose(); } - }).catch(error => { this.doClose(); }); + }).catch(() => { this.doClose(); }); } } }; diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/trainMoveEvently.vue b/src/jmapNew/theme/foshan_01/menus/dialog/trainMoveEvently.vue index d85d1fd44..3ddaf3c30 100644 --- a/src/jmapNew/theme/foshan_01/menus/dialog/trainMoveEvently.vue +++ b/src/jmapNew/theme/foshan_01/menus/dialog/trainMoveEvently.vue @@ -136,7 +136,7 @@ export default { if (valid) { this.doClose(); } - }).catch(error => { + }).catch(() => { this.loading = false; this.doClose(); // this.$refs.noticeInfo.doShow(operate); @@ -156,7 +156,7 @@ export default { if (valid) { this.doClose(); } - }).catch(error => { this.doClose(); }); + }).catch(() => { this.doClose(); }); } } }; diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/twoConfirmation.vue index d4a9b1c0b..ea4b1d725 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/twoConfirmation.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/twoConfirmation.vue @@ -121,7 +121,7 @@ export default { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); } - }, 1000).catch((error) => { + }, 1000).catch(() => { this.$refs.noticeInfo.doShow(operate); }); } diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userAdd.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userAdd.vue index 0dceee7b0..a12c36132 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userAdd.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userAdd.vue @@ -155,7 +155,7 @@ export default { if (valid) { this.doClose(); } - }).catch(error => { this.doClose(); this.model; }); + }).catch(() => { this.doClose(); this.model; }); } } }; diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userDelete.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userDelete.vue index 8918f915b..48214bdea 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userDelete.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userDelete.vue @@ -127,7 +127,7 @@ export default { if (valid) { this.doClose(); } - }).catch(error => { this.doClose(); }); + }).catch(() => { this.doClose(); }); } } }; diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userEdit.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userEdit.vue index 672e431ef..a15787167 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userEdit.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userEdit.vue @@ -172,7 +172,7 @@ export default { if (valid) { this.doClose(); } - }).catch(error => { this.doClose(); }); + }).catch(() => { this.doClose(); }); } } }; diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/detainTrainContorl.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/detainTrainContorl.vue index b669a21eb..3d1b0deca 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuDialog/detainTrainContorl.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/detainTrainContorl.vue @@ -149,7 +149,7 @@ export default { } else { this.disabledSure = false; } - }).catch((error) => { + }).catch(() => { this.loading = false; this.doClose(); this.$refs.noticeInfo.doShow(operate); diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/detainTrainContorlUpDown.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/detainTrainContorlUpDown.vue index d1977931f..f0a127308 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuDialog/detainTrainContorlUpDown.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/detainTrainContorlUpDown.vue @@ -149,7 +149,7 @@ export default { } else { this.disabledSure = false; } - }).catch((error) => { + }).catch(() => { this.loading = false; this.doClose(); this.$refs.noticeInfo.doShow(operate); @@ -182,7 +182,7 @@ export default { } }; -