From 85e7fea0ae7d2d4a240ac87219194f1aa516cc59 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 19 Mar 2020 18:13:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/chengdu_03/menus/menuButton.vue     | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue
index c1077c018..b55017800 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue
@@ -326,7 +326,9 @@ export default {
                     operate.cmdType = CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL;
                     operate.param = {signalCode: deviceList[0].code};
                     this.deviceList = [];
-                    this.$store.dispatch('training/nextNew', newOperate).then(({ valid, response }) => {});
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {}).catch(() => {
+                        this.$refs.noticeInfo.doShow(operate);
+                    });
                 }
             } else if (deviceList.length === 2) {
                 this.routeList.forEach(item => {
@@ -334,7 +336,9 @@ export default {
                         operate.cmdType = CMD.Signal.CMD_SIGNAL_SET_ROUTE;
                         operate.param = {routeCode: item.code};
                         this.deviceList = [];
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {});
+                        this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {}).catch(() => {
+                            this.$refs.noticeInfo.doShow(operate);
+                        });
                     }
                 });
             }
@@ -414,6 +418,8 @@ export default {
                             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                             this.$refs.password.doShow(operate);
                         }
+                    }).catch(() => {
+                        this.$refs.noticeInfo.doShow(operate);
                     });
                 } else {
                     const operate = {
@@ -429,6 +435,8 @@ export default {
                             operate['operateNext'] = this.Command.close.password.operation;
                             this.$refs.password.doShow(operate);
                         }
+                    }).catch(() => {
+                        this.$refs.noticeInfo.doShow(operate);
                     });
                 }
             } else if (deviceList.length === 2) {
@@ -442,7 +450,9 @@ export default {
                     if (item.startSignalCode === deviceList[0].code && item.endSignalCode === deviceList[1].code) {
                         operate.param = {routeCode: item.code};
                         this.deviceList = [];
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {});
+                        this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {}).catch(() => {
+                            this.$refs.noticeInfo.doShow(operate);
+                        });
                     }
                 });
             }
@@ -555,7 +565,9 @@ export default {
                     const operate = this.handelOperate(model);
                     if (this.cmdTypeList.indexOf(model._type) >= 0) {
                         this.deviceList = [];
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {});
+                        this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {}).catch(() => {
+                            this.$refs.noticeInfo.doShow(operate);
+                        });
                     } else {
                         Handler.clear(); // 清空操作组
                         this.$store.dispatch('menuOperation/setButtonOperation', null);