From 03bfdd76f2f4ad2be2bdef88dcc1ac31c199327f Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Fri, 22 May 2020 11:30:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A5=BF=E5=AE=89=E7=BA=BF?= =?UTF-8?q?=E8=B7=AF=E9=94=99=E8=AF=AF=E6=8F=90=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/childDialog/noticeInfo.vue | 6 +-- .../dialog/childDialog/confirmControl.vue | 22 ++++----- .../menus/dialog/childDialog/confirmTrain.vue | 2 +- .../xian_01/menus/dialog/routeControl.vue | 14 +++--- .../xian_01/menus/dialog/routeDetail.vue | 2 +- .../xian_01/menus/dialog/routeHandControl.vue | 8 +-- .../theme/xian_01/menus/dialog/routeLock.vue | 6 +-- .../xian_01/menus/dialog/routeSelection.vue | 4 +- .../xian_01/menus/dialog/sectionControl.vue | 4 +- .../theme/xian_01/menus/dialog/setFault.vue | 4 +- .../menus/dialog/standBackStrategy.vue | 2 +- .../xian_01/menus/dialog/standControl.vue | 4 +- .../menus/dialog/standDetainTrainAll.vue | 2 +- .../menus/dialog/stationCmdControl.vue | 5 +- .../menus/dialog/stationHumanControlAll.vue | 2 +- .../dialog/stationSetRouteControlAll.vue | 2 +- .../xian_01/menus/dialog/switchControl.vue | 4 +- .../xian_01/menus/dialog/trainAddPlan.vue | 4 +- .../xian_01/menus/dialog/trainControl.vue | 8 +-- .../xian_01/menus/dialog/trainCreate.vue | 2 +- .../xian_01/menus/dialog/trainDelete.vue | 2 +- .../theme/xian_01/menus/dialog/trainMove.vue | 2 +- .../xian_01/menus/dialog/trainSwitch.vue | 2 +- .../theme/xian_01/menus/menuCancel.vue | 8 ++- .../childDialog/twoConfirmation.vue | 4 +- .../xian_01/menus/menuDialog/passwordBox.vue | 2 +- .../xian_01/menus/menuDialog/trainAdd.vue | 4 +- .../xian_01/menus/menuDialog/trainDelete.vue | 4 +- .../menus/menuDialog/trainTranstalet.vue | 4 +- .../theme/xian_01/menus/menuStation.vue | 49 ++++++------------- src/jmapNew/theme/xian_01/menus/menuTrain.vue | 12 ++--- .../xian_01/menus/passiveDialog/control.vue | 4 +- src/scripts/cmdPlugin/CommandEnum.js | 6 ++- 33 files changed, 100 insertions(+), 110 deletions(-) diff --git a/src/jmapNew/theme/xian_01/menus/dialog/childDialog/childDialog/noticeInfo.vue b/src/jmapNew/theme/xian_01/menus/dialog/childDialog/childDialog/noticeInfo.vue index 6df116961..672cfec3d 100644 --- a/src/jmapNew/theme/xian_01/menus/dialog/childDialog/childDialog/noticeInfo.vue +++ b/src/jmapNew/theme/xian_01/menus/dialog/childDialog/childDialog/noticeInfo.vue @@ -32,8 +32,7 @@ export default { data() { return { dialogShow: false, - messages: [this.$t('tip.commandFailed')], - operate: null + messages: [this.$t('tip.commandFailed')] }; }, computed: { @@ -53,8 +52,7 @@ export default { }); }, methods: { - doShow(operate, messages) { - this.operate = operate || {}; + doShow(messages) { this.dialogShow = true; this.messages = [this.$t('tip.commandFailed')]; if (messages && messages != 'null') { diff --git a/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmControl.vue index 208f4a5f6..5e7296eb6 100644 --- a/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmControl.vue +++ b/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmControl.vue @@ -170,7 +170,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, // 信号关灯 @@ -187,10 +187,10 @@ export default { if (valid) { this.doClose(); } - }).catch((error) => { + }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate, [error.message]); + this.$refs.noticeInfo.doShow(); }); }, // 信号重开 @@ -207,10 +207,10 @@ export default { if (valid) { this.doClose(); } - }).catch((error) => { + }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate, [error.message]); + this.$refs.noticeInfo.doShow(); }); }, // 取消进路 @@ -230,7 +230,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, // 进路交人工控 @@ -250,7 +250,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, // 进路交ATS自动控 @@ -270,7 +270,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, // 设置运行等级 @@ -291,7 +291,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, // 停站时间 @@ -312,7 +312,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, // 设置折返策略 @@ -333,7 +333,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, cancel() { diff --git a/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmTrain.vue b/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmTrain.vue index 92342891c..1d72826c7 100644 --- a/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmTrain.vue +++ b/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmTrain.vue @@ -152,7 +152,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, cancel() { diff --git a/src/jmapNew/theme/xian_01/menus/dialog/routeControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/routeControl.vue index b47664af9..3f5ef2062 100644 --- a/src/jmapNew/theme/xian_01/menus/dialog/routeControl.vue +++ b/src/jmapNew/theme/xian_01/menus/dialog/routeControl.vue @@ -151,10 +151,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(); }); }, // 信号关灯 @@ -206,7 +206,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, // 取消联锁自动进路 @@ -226,7 +226,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, // 设置联锁自动触发 @@ -246,7 +246,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, // 取消联锁自动触发 @@ -267,7 +267,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, // 取消 @@ -281,7 +281,7 @@ export default { } }).catch(() => { this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); } } diff --git a/src/jmapNew/theme/xian_01/menus/dialog/routeDetail.vue b/src/jmapNew/theme/xian_01/menus/dialog/routeDetail.vue index 3d5cbc403..c74603b7b 100644 --- a/src/jmapNew/theme/xian_01/menus/dialog/routeDetail.vue +++ b/src/jmapNew/theme/xian_01/menus/dialog/routeDetail.vue @@ -143,7 +143,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, cancel() { diff --git a/src/jmapNew/theme/xian_01/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/routeHandControl.vue index a5617e325..f205504b2 100644 --- a/src/jmapNew/theme/xian_01/menus/dialog/routeHandControl.vue +++ b/src/jmapNew/theme/xian_01/menus/dialog/routeHandControl.vue @@ -297,10 +297,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(); }); }, // 进路交自动控 @@ -311,10 +311,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(); }); }, cancel() { diff --git a/src/jmapNew/theme/xian_01/menus/dialog/routeLock.vue b/src/jmapNew/theme/xian_01/menus/dialog/routeLock.vue index d68020d00..719613135 100644 --- a/src/jmapNew/theme/xian_01/menus/dialog/routeLock.vue +++ b/src/jmapNew/theme/xian_01/menus/dialog/routeLock.vue @@ -138,10 +138,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(); }); }, cancel() { @@ -154,7 +154,7 @@ export default { } }).catch(() => { this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); } } diff --git a/src/jmapNew/theme/xian_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/xian_01/menus/dialog/routeSelection.vue index f30ba1a60..a8f0d4cb9 100644 --- a/src/jmapNew/theme/xian_01/menus/dialog/routeSelection.vue +++ b/src/jmapNew/theme/xian_01/menus/dialog/routeSelection.vue @@ -232,10 +232,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(); }); } }, diff --git a/src/jmapNew/theme/xian_01/menus/dialog/sectionControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/sectionControl.vue index 616652fdb..2f97efb8b 100644 --- a/src/jmapNew/theme/xian_01/menus/dialog/sectionControl.vue +++ b/src/jmapNew/theme/xian_01/menus/dialog/sectionControl.vue @@ -129,10 +129,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(); }); }, cancel() { diff --git a/src/jmapNew/theme/xian_01/menus/dialog/setFault.vue b/src/jmapNew/theme/xian_01/menus/dialog/setFault.vue index 54916da3c..4b11511d4 100644 --- a/src/jmapNew/theme/xian_01/menus/dialog/setFault.vue +++ b/src/jmapNew/theme/xian_01/menus/dialog/setFault.vue @@ -117,10 +117,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(); }); }, diff --git a/src/jmapNew/theme/xian_01/menus/dialog/standBackStrategy.vue b/src/jmapNew/theme/xian_01/menus/dialog/standBackStrategy.vue index a1d0c1e09..8df2c96e0 100644 --- a/src/jmapNew/theme/xian_01/menus/dialog/standBackStrategy.vue +++ b/src/jmapNew/theme/xian_01/menus/dialog/standBackStrategy.vue @@ -214,7 +214,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); } else { this.doClose(); diff --git a/src/jmapNew/theme/xian_01/menus/dialog/standControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/standControl.vue index 54f372905..c86a9b2f4 100644 --- a/src/jmapNew/theme/xian_01/menus/dialog/standControl.vue +++ b/src/jmapNew/theme/xian_01/menus/dialog/standControl.vue @@ -153,10 +153,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(); }); }, cancel() { diff --git a/src/jmapNew/theme/xian_01/menus/dialog/standDetainTrainAll.vue b/src/jmapNew/theme/xian_01/menus/dialog/standDetainTrainAll.vue index fae73b1f3..5c151a61a 100644 --- a/src/jmapNew/theme/xian_01/menus/dialog/standDetainTrainAll.vue +++ b/src/jmapNew/theme/xian_01/menus/dialog/standDetainTrainAll.vue @@ -170,7 +170,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, cancel() { diff --git a/src/jmapNew/theme/xian_01/menus/dialog/stationCmdControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/stationCmdControl.vue index 7e544c8f6..fd2b2973e 100644 --- a/src/jmapNew/theme/xian_01/menus/dialog/stationCmdControl.vue +++ b/src/jmapNew/theme/xian_01/menus/dialog/stationCmdControl.vue @@ -79,6 +79,7 @@