From 404c56e874cad20051aadb92d2d0d128c86336ac Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 9 Jul 2020 13:05:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=8F=B8=E6=9C=BA=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newMap/jointTrainingNew/memberManage/membersManage.vue  | 5 +++--
 src/views/newMap/jointTrainingNew/menuDemon.vue             | 1 +
 src/views/newMap/jointTrainingNew/newChatView/chatBox.vue   | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue b/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue
index a5cd1246a..500e38586 100644
--- a/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue
+++ b/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue
@@ -208,8 +208,8 @@ export default {
             this.activeTrains = [];
             const activeTrainList = this.$store.state.map.activeTrainList;
             if (activeTrainList && activeTrainList.length) {
-                activeTrainList.forEach(train => {
-                    this.activeTrains.push(train.groupNumber);
+                activeTrainList.forEach(groupNumber => {
+                    this.activeTrains.push(groupNumber);
                 });
             }
             this.$refs.tree && this.$refs.tree.filter(this.queryMember);
@@ -270,6 +270,7 @@ export default {
             if (data.type && data.type === 'DRIVER' && !this.activeTrains.includes(data.deviceCode)) {
                 driverNoShow = false;
             }
+            console.log(data.type, data.deviceCode, this.activeTrains, driverNoShow);
             return (data.label.indexOf(value) !== -1 || flag) && driverNoShow;
         },
         handlerMemberOnOff(data) {
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 8da8fba5e..ea10563b9 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -318,6 +318,7 @@ export default {
             }
             this.$store.dispatch('training/over').then(() => {
                 this.backLoading = true;
+                this.$store.dispatch('map/resetActiveTrainList');
                 if (this.$route.query.projectDevice) {
                     this.$store.dispatch('LogOut').then(() => {
                         location.reload();
diff --git a/src/views/newMap/jointTrainingNew/newChatView/chatBox.vue b/src/views/newMap/jointTrainingNew/newChatView/chatBox.vue
index 7629c6e70..8c9e1dd7a 100644
--- a/src/views/newMap/jointTrainingNew/newChatView/chatBox.vue
+++ b/src/views/newMap/jointTrainingNew/newChatView/chatBox.vue
@@ -186,8 +186,8 @@ export default {
             this.activeTrains = [];
             const activeTrainList = this.$store.state.map.activeTrainList;
             if (activeTrainList && activeTrainList.length) {
-                activeTrainList.forEach(train => {
-                    this.activeTrains.push(train.groupNumber);
+                activeTrainList.forEach(groupNumber => {
+                    this.activeTrains.push(groupNumber);
                 });
             }
             if (this.$refs.tree) {
@@ -457,7 +457,7 @@ export default {
                 flag = this.memberData[data.id].nickName.indexOf(value) !== -1;
             }
             let driverNoShow = true;
-            if (data.role && data.role === 'DRIVER' && !this.activeTrains.includes(data.deviceCode)) {
+            if (data.type && data.type === 'DRIVER' && !this.activeTrains.includes(data.deviceCode)) {
                 driverNoShow = false;
             }
             return (data.label.indexOf(value) !== -1 || flag) && driverNoShow;