From 8b3f4de3b7397514ecb3f20d2d417c1573d2010a Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Fri, 29 May 2020 17:58:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A3=81=E5=88=A4?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/jsxt/refereeList/editScore.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

From 8b23874ea5d5fcfd610bc2826ea25f3b0dd9c70a Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 29 May 2020 18:15:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=BC=94=E7=BB=83?=
 =?UTF-8?q?=E4=BB=BF=E7=9C=9F=E8=81=8A=E5=A4=A9=E4=BB=A3=E7=A0=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/jointTrainingNew/chatView/chatBox.vue       | 5 ++++-
 .../newMap/jointTrainingNew/chatView/chatCoversitionList.vue | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

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