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

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
                 };
             });
         },

src/views/newMap/jointTrainingNew/chatView/chatBox.vue

@@ -4,7 +4,7 @@
     <div v-show="!minimize" class="chat-box">
       <chat-member-list ref="chatMemberList" :group="group" :current-coversition="currentCoversition" />
       <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-box-header">
             <div class="chat-box-header-title">{{ headerTitle }}</div>
@@ -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;

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);
             });