joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

调整会话和drts倒计时时间

Browse Source
This commit is contained in:
fan 2020-09-11 13:23:24 +08:00
parent 60bfa0504b
commit 3ca753a31b
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/login/index.vue
View File

@ -213,7 +213,7 @@ export default {
versionBaseNoShow: VersionBaseNoShow, versionBaseNoShow: VersionBaseNoShow,
mainBodyNoShow: MainBodyNoShow, mainBodyNoShow: MainBodyNoShow,
noQrcodeList: NoQrcodeList, noQrcodeList: NoQrcodeList,
expirationDate: 1607562000000, expirationDate: 1605488400000,
countdown: null, countdown: null,
days: [0, 0, 0], days: [0, 0, 0],
gameOver: false, gameOver: false,

3
src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
View File

@ -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; this.treeData[2].children = driverList;
} else { } else {
this.activeTrainList = activeTrainList; this.activeTrainList = activeTrainList;
@ -195,7 +195,6 @@ export default {
children: result.deviceListData[4] children: result.deviceListData[4]
}]; }];
this.memberData = result.lastMemberList; this.memberData = result.lastMemberList;
// 设置当前角色 // 设置当前角色
const member = resp.data.find(mem=>{ const member = resp.data.find(mem=>{
return mem.userId != '' && mem.userId != undefined; return mem.userId != '' && mem.userId != undefined;

2
src/views/newMap/displayNew/utils.js
View File

@ -45,9 +45,9 @@ export function covertMemberData (activeTrainList, resp) {
if (activeTrainList.length > 0) { if (activeTrainList.length > 0) {
if (activeTrainList.includes(member.deviceCode)) { if (activeTrainList.includes(member.deviceCode)) {
deviceListData[deviceTypeIndex].push(member); deviceListData[deviceTypeIndex].push(member);
lastMemberList.push(member);
} }
} }
lastMemberList.push(member);
driverList.push(member); driverList.push(member);
} else { } else {
deviceListData[deviceTypeIndex].push(member); deviceListData[deviceTypeIndex].push(member);

5
src/views/newMap/jointTrainingNew/chatView/chatBox.vue
View File

@ -205,7 +205,7 @@ export default {
this.goCommonConversation(); this.goCommonConversation();
this.myMemberId = ''; this.myMemberId = '';
} else { } else {
this.myMemberId = this.simulationUsers[this.userId].memberId; this.myMemberId = (this.simulationUsers[this.userId] || {}).memberId;
} }
}, },
'$store.state.map.mapViewLoadedCount':function(val) { '$store.state.map.mapViewLoadedCount':function(val) {
@ -503,6 +503,9 @@ export default {
if (memberList && memberList.length) { if (memberList && memberList.length) {
memberList.forEach(memberId => { memberList.forEach(memberId => {
const member = this.memberData[memberId]; const member = this.memberData[memberId];
if (member && member.type === 'DRIVER' && !this.activeTrains.includes(member.deviceCode)) {
return;
}
if (member && member.userId) { if (member && member.userId) {
this.memberIdList.push(member.id); this.memberIdList.push(member.id);
this.userString += ((this.userString ? ',' : '') + member.label + '(' + this.simulationUsers[member.userId].nickName + ')'); this.userString += ((this.userString ? ',' : '') + member.label + '(' + this.simulationUsers[member.userId].nickName + ')');