diff --git a/src/views/jsxt/refereeList/editScore.vue b/src/views/jsxt/refereeList/editScore.vue index 158a3c744..fad2dd07f 100644 --- a/src/views/jsxt/refereeList/editScore.vue +++ b/src/views/jsxt/refereeList/editScore.vue @@ -58,11 +58,12 @@ export default { getTestPaperDatail(data.raceId).then(res => { this.theoryScore = res.data.theoryScore; this.practicalScore = res.data.practicalScore; + console.log(data); this.info = { raceId: data.raceId, userId: data.userId, - theoryScore: data.theoryScore, - practiceScore: data.practiceScore + theoryScore: data.artificialTheoryScore || data.theoryScore, + practiceScore: data.artificialPracticeScore || data.practiceScore }; }); }, diff --git a/src/views/newMap/jointTrainingNew/chatView/chatBox.vue b/src/views/newMap/jointTrainingNew/chatView/chatBox.vue index 7d459b424..b1f77c663 100644 --- a/src/views/newMap/jointTrainingNew/chatView/chatBox.vue +++ b/src/views/newMap/jointTrainingNew/chatView/chatBox.vue @@ -4,7 +4,7 @@
- +
{{ headerTitle }}
@@ -131,6 +131,9 @@ export default { hideAddCoversition() { this.isHasCoversition = true; }, + showAddCoverition() { + this.isHasCoversition = false; + }, addCoversition({data, headerTitle}) { this.$refs.chatCoversitionList.addCoversition(data); this.isHasCoversition = true; diff --git a/src/views/newMap/jointTrainingNew/chatView/chatCoversitionList.vue b/src/views/newMap/jointTrainingNew/chatView/chatCoversitionList.vue index f8991c771..a64faae8e 100644 --- a/src/views/newMap/jointTrainingNew/chatView/chatCoversitionList.vue +++ b/src/views/newMap/jointTrainingNew/chatView/chatCoversitionList.vue @@ -76,6 +76,7 @@ export default { closeCoversition(coversitionId) { quitCoversition(this.group, coversitionId).then(res=>{ this.initPage(true); + this.$emit('showAddCoverition'); }).catch(error=>{ this.$messageBox('退出会话失败: ' + error.message); });