From 1fc6bd7058d817698d754851783c8a8b049ef71b Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Sun, 28 Jun 2020 14:50:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E6=9D=83=E8=BD=AC=E7=A7=BB?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/foshan_01/menus/passiveDialog/timeout.vue       | 4 +---
 .../theme/fuzhou_01/menus/passiveDialog/timeout.vue       | 4 +---
 src/jmapNew/theme/xian_01/menus/passiveDialog/timeout.vue | 8 +++-----
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/jmapNew/theme/foshan_01/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/foshan_01/menus/passiveDialog/timeout.vue
index 1633b4492..fbac967a4 100644
--- a/src/jmapNew/theme/foshan_01/menus/passiveDialog/timeout.vue
+++ b/src/jmapNew/theme/foshan_01/menus/passiveDialog/timeout.vue
@@ -41,12 +41,10 @@ export default {
     watch: {
         '$store.state.socket.msgHead': function (elem) {
             if (elem && elem.type == 'resp' && (elem.timeout || !elem.agree)) {
-                const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
-                const station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
+                const station = this.$store.getters['map/getDeviceByCode'](elem.stationCodes[0]);
                 const newOperate = {
                     name: station.name
                 };
-
                 if (elem.timeout) {
                     newOperate['msg'] = this.$t('menu.passiveDialog.requestTimedOut');
                     this.doShow(newOperate);
diff --git a/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/timeout.vue
index c8a23d7f0..856238f4b 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/timeout.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/timeout.vue
@@ -41,8 +41,7 @@ export default {
     watch: {
         '$store.state.socket.msgHead': function (elem) {
             if (elem && elem.type == 'resp' && (elem.timeout || !elem.agree)) {
-                const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
-                const station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
+                const station = this.$store.getters['map/getDeviceByCode'](elem.stationCodes[0]);
                 const newOperate = {
                     name: station.name
                 };
@@ -83,7 +82,6 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.close.notice.operation
             };
-
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
diff --git a/src/jmapNew/theme/xian_01/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/xian_01/menus/passiveDialog/timeout.vue
index 9cfd45d1e..9150f5f8a 100644
--- a/src/jmapNew/theme/xian_01/menus/passiveDialog/timeout.vue
+++ b/src/jmapNew/theme/xian_01/menus/passiveDialog/timeout.vue
@@ -41,12 +41,10 @@ export default {
     watch: {
         '$store.state.socket.msgHead': function (elem) {
             if (elem && elem.type == 'resp' && (elem.timeout || !elem.agree)) {
-                const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
-                const station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
+                const station = this.$store.getters['map/getDeviceByCode'](elem.stationCodes[0]);
                 const newOperate = {
                     name: station.name
                 };
-
                 if (elem.timeout) {
                     newOperate['msg'] = this.$t('menu.passiveDialog.requestTimedOut');
                     this.doShow(newOperate);
@@ -84,7 +82,7 @@ export default {
                 operation: OperationEvent.Command.close.notice.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -95,7 +93,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.close.notice.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();