diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index fd1587d18..53d0178d3 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -213,7 +213,7 @@ export default {
             versionBaseNoShow: VersionBaseNoShow,
             mainBodyNoShow: MainBodyNoShow,
             noQrcodeList: NoQrcodeList,
-            expirationDate: 1607562000000,
+            expirationDate: 1605488400000,
             countdown: null,
             days: [0, 0, 0],
             gameOver: false,
diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
index 0877b530f..58ac69080 100644
--- a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
+++ b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
@@ -151,7 +151,7 @@ export default {
                         }
                     });
                 }
-                this.memberData = [...this.treeData[0].children, ...this.treeData[1].children, ...this.treeData[2].children, ...this.treeData[3].children, ...this.treeData[4].children];
+                // this.memberData = [...this.treeData[0].children, ...this.treeData[1].children, ...this.treeData[2].children, ...this.treeData[3].children, ...this.treeData[4].children];
                 this.treeData[2].children = driverList;
             } else {
                 this.activeTrainList = activeTrainList;
@@ -195,7 +195,6 @@ export default {
                     children: result.deviceListData[4]
                 }];
                 this.memberData = result.lastMemberList;
-
                 // 设置当前角色
                 const member = resp.data.find(mem=>{
                     return mem.userId != '' && mem.userId != undefined;
diff --git a/src/views/newMap/displayNew/utils.js b/src/views/newMap/displayNew/utils.js
index 83c76350c..38b5f9439 100644
--- a/src/views/newMap/displayNew/utils.js
+++ b/src/views/newMap/displayNew/utils.js
@@ -45,9 +45,9 @@ export function covertMemberData (activeTrainList, resp) {
                 if (activeTrainList.length > 0) {
                     if (activeTrainList.includes(member.deviceCode)) {
                         deviceListData[deviceTypeIndex].push(member);
-                        lastMemberList.push(member);
                     }
                 }
+                lastMemberList.push(member);
                 driverList.push(member);
             } else {
                 deviceListData[deviceTypeIndex].push(member);
diff --git a/src/views/newMap/jointTrainingNew/chatView/chatBox.vue b/src/views/newMap/jointTrainingNew/chatView/chatBox.vue
index 02592f3cd..749bac1ca 100644
--- a/src/views/newMap/jointTrainingNew/chatView/chatBox.vue
+++ b/src/views/newMap/jointTrainingNew/chatView/chatBox.vue
@@ -205,7 +205,7 @@ export default {
                 this.goCommonConversation();
                 this.myMemberId = '';
             } else {
-                this.myMemberId = this.simulationUsers[this.userId].memberId;
+                this.myMemberId = (this.simulationUsers[this.userId] || {}).memberId;
             }
         },
         '$store.state.map.mapViewLoadedCount':function(val) {
@@ -503,6 +503,9 @@ export default {
             if (memberList && memberList.length) {
                 memberList.forEach(memberId => {
                     const member = this.memberData[memberId];
+                    if (member && member.type === 'DRIVER' && !this.activeTrains.includes(member.deviceCode)) {
+                        return;
+                    }
                     if (member && member.userId) {
                         this.memberIdList.push(member.id);
                         this.userString += ((this.userString ? ',' : '') + member.label + '(' + this.simulationUsers[member.userId].nickName + ')');