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:
fan 2020-05-29 18:25:01 +08:00
commit c395fcbcff
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/jsxt/refereeList/editScore.vue
View File

@ -58,11 +58,12 @@ export default {
getTestPaperDatail(data.raceId).then(res => { getTestPaperDatail(data.raceId).then(res => {
this.theoryScore = res.data.theoryScore; this.theoryScore = res.data.theoryScore;
this.practicalScore = res.data.practicalScore; this.practicalScore = res.data.practicalScore;
console.log(data);
this.info = { this.info = {
raceId: data.raceId, raceId: data.raceId,
userId: data.userId, userId: data.userId,
theoryScore: data.theoryScore, theoryScore: data.artificialTheoryScore || data.theoryScore,
practiceScore: data.practiceScore practiceScore: data.artificialPracticeScore || data.practiceScore
}; };
}); });
}, },

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

@ -4,7 +4,7 @@
<div v-show="!minimize" class="chat-box"> <div v-show="!minimize" class="chat-box">
<chat-member-list ref="chatMemberList" :group="group" :current-coversition="currentCoversition" /> <chat-member-list ref="chatMemberList" :group="group" :current-coversition="currentCoversition" />
<div class="chat-box-main"> <div class="chat-box-main">
<chat-coversition-list ref="chatCoversitionList" :group="group" @hideAddCoversition="hideAddCoversition" @setCurrentCoversition="setCurrentCoversition" @setHeadTitle="setHeadTitle" /> <chat-coversition-list ref="chatCoversitionList" :group="group" @showAddCoverition="showAddCoverition" @hideAddCoversition="hideAddCoversition" @setCurrentCoversition="setCurrentCoversition" @setHeadTitle="setHeadTitle" />
<div class="chat-window"> <div class="chat-window">
<div class="chat-box-header"> <div class="chat-box-header">
<div class="chat-box-header-title">{{ headerTitle }}</div> <div class="chat-box-header-title">{{ headerTitle }}</div>
@ -131,6 +131,9 @@ export default {
hideAddCoversition() { hideAddCoversition() {
this.isHasCoversition = true; this.isHasCoversition = true;
}, },
showAddCoverition() {
this.isHasCoversition = false;
},
addCoversition({data, headerTitle}) { addCoversition({data, headerTitle}) {
this.$refs.chatCoversitionList.addCoversition(data); this.$refs.chatCoversitionList.addCoversition(data);
this.isHasCoversition = true; this.isHasCoversition = true;

1
src/views/newMap/jointTrainingNew/chatView/chatCoversitionList.vue
View File

@ -76,6 +76,7 @@ export default {
closeCoversition(coversitionId) { closeCoversition(coversitionId) {
quitCoversition(this.group, coversitionId).then(res=>{ quitCoversition(this.group, coversitionId).then(res=>{
this.initPage(true); this.initPage(true);
this.$emit('showAddCoverition');
}).catch(error=>{ }).catch(error=>{
this.$messageBox('退出会话失败: ' + error.message); this.$messageBox('退出会话失败: ' + error.message);
}); });