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

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
zyy 2020-07-14 18:14:53 +08:00
commit b2f9e388aa
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -339,9 +339,10 @@ export default {
this.handleLoginSucessRoute(); this.handleLoginSucessRoute();
}); });
}).catch(error => { }).catch(error => {
if (error.data && error.data.status === 'EXPIRE') { if ((error.data && error.data.status === 'EXPIRE') || error.code != 200) {
this.loadingCode = true; this.loadingCode = true;
this.loginUrl = ''; this.loginUrl = '';
this.tipsMsg = error.message || '';
} else { } else {
self.checkLoginStatus(); self.checkLoginStatus();
} }

2
src/views/newMap/jointTrainingNew/memberManage/e-members.vue
View File

@ -140,7 +140,7 @@ export default {
height: 520px; height: 520px;
&--list { &--list {
background: #fff; background: #fff;
height: calc(100% - 39px); height: calc(100% - 109px);
border-bottom: 1px #ccc solid; border-bottom: 1px #ccc solid;
&::-webkit-scrollbar { &::-webkit-scrollbar {

4
src/views/newMap/jointTrainingNew/memberManage/membersManage.vue
View File

@ -10,7 +10,7 @@
> >
<div class="room"> <div class="room">
<div class="room__container"> <div class="room__container">
<div style="width: 70%;height: 100%;"> <div style="width: 70%;height: calc(100%-20px);">
<div style="margin-left: 10px;margin-right: 10px;"> <div style="margin-left: 10px;margin-right: 10px;">
<el-input v-model="queryMember" placeholder="请输入搜索人员"> <el-input v-model="queryMember" placeholder="请输入搜索人员">
<el-button slot="append" icon="el-icon-search" /> <el-button slot="append" icon="el-icon-search" />
@ -22,7 +22,7 @@
:data="treeData" :data="treeData"
:props="defaultProps" :props="defaultProps"
default-expand-all default-expand-all
style="margin: 10px;margin-bottom: 0;border: 1px solid #ccc;overflow-y: auto;height: calc(100% - 50px);" style="margin: 10px;margin-bottom: 0;border: 1px solid #ccc;overflow-y: auto;height: calc(100% - 120px);"
:filter-node-method="filterNode" :filter-node-method="filterNode"
@node-click="handleNodeClick" @node-click="handleNodeClick"
> >

2
src/views/newMap/jointTrainingNew/newChatView/chatBox.vue
View File

@ -534,7 +534,7 @@ export default {
const user = this.simulationUsers[this.$store.state.user.id]; const user = this.simulationUsers[this.$store.state.user.id];
this.isConversitionCreator = conversation.creatorId == user.memberId; this.isConversitionCreator = conversation.creatorId == user.memberId;
!conversation.over && conversation.memberList.forEach(member =>{ !conversation.over && conversation.memberList.forEach(member =>{
if (member.memberId == user.memberId) { if (member.memberId == user.memberId && member.connect) {
this.conversitionMemberList = conversation.memberList; this.conversitionMemberList = conversation.memberList;
this.conversitionId = conversation.id; this.conversitionId = conversation.id;
this.messageList = []; this.messageList = [];

4
src/views/newMap/jointTrainingNew/newChatView/chatMemberList.vue
View File

@ -9,7 +9,6 @@
:style="computedStyle(member)" :style="computedStyle(member)"
:title="memberData[member.memberId].label + (memberData[member.memberId].userId? '(' + (simulationUsers[memberData[member.memberId].userId] || {}).nickName + ')': '')" :title="memberData[member.memberId].label + (memberData[member.memberId].userId? '(' + (simulationUsers[memberData[member.memberId].userId] || {}).nickName + ')': '')"
>{{ memberData[member.memberId].label + (memberData[member.memberId].userId? '(' + (simulationUsers[memberData[member.memberId].userId] || {}).nickName + ')': '') }}</div> >{{ memberData[member.memberId].label + (memberData[member.memberId].userId? '(' + (simulationUsers[memberData[member.memberId].userId] || {}).nickName + ')': '') }}</div>
<!-- :class="member.online?'each-chat-member':'each-chat-member each-chat-member-outline'" -->
</div> </div>
</div> </div>
</template> </template>
@ -53,6 +52,9 @@ export default {
const userId = (this.memberData[member.memberId] || {}).userId; const userId = (this.memberData[member.memberId] || {}).userId;
if (userId && userId == this.userId) { if (userId && userId == this.userId) {
return {color: 'red'}; return {color: 'red'};
} else if (userId) {
const user = this.simulationUsers[userId];
return {color: member.connect && user.online ? 'green' : 'gray'};
} else { } else {
return {color: member.connect ? 'green' : 'gray'}; return {color: member.connect ? 'green' : 'gray'};
} }