From 920be2f0d9c6a1916456f490d89bc83461ce8328 Mon Sep 17 00:00:00 2001
From: tianea <tianxyy80@gmail.com>
Date: Tue, 30 Aug 2022 22:02:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/system/exam.vue       |  6 +-
 front/src/views/system/examresult.vue | 79 +++++++++++++++++++++------
 2 files changed, 66 insertions(+), 19 deletions(-)

diff --git a/front/src/views/system/exam.vue b/front/src/views/system/exam.vue
index 5125eca..f58d701 100644
--- a/front/src/views/system/exam.vue
+++ b/front/src/views/system/exam.vue
@@ -578,9 +578,9 @@ export default {
     display: inline-block;
     border-radius: 5px;
     color: black;
-    padding: .5rem;
-    margin-top: 0.5rem;
-    margin-right: .5rem;
+    padding: .3rem;
+    margin-top: 0.3rem;
+    margin-right: .3rem;
 }
 .tz-exam-box-tips{
     text-align: left;
diff --git a/front/src/views/system/examresult.vue b/front/src/views/system/examresult.vue
index c2f6e46..e070fcb 100644
--- a/front/src/views/system/examresult.vue
+++ b/front/src/views/system/examresult.vue
@@ -73,7 +73,7 @@
                     <div :class=" tabId == 3?'exam-tab-selected ':'' " @click="changeTab(3)">案例题</div>
                 </div>
                 <div class="exam-tab-content">
-                    <div>
+                    <div class="q_split">
                         <a name="single" />
                         单选题（共<span>{{singleInfo.size}}</span>题,每题<span>{{singleInfo.score}}</span>分,共<span>{{singleInfo.sumScore}}</span>分）
                     </div>
@@ -82,17 +82,20 @@
                         <div class="question-stem">
                              {{cq.id}}.{{cq.item.stem}}
                         </div>
-                         <div  class="tz-text-left" >我的选项： {{getMyAnswer(cq.item.id,0)}}</div>
                         <div  v-if="cq.item.questionType == 1">
                             <div v-for="item in cq.item.answerList" :key="item.id" class="question">
                                 <b-radio disabled v-model="cq.item.answerId"  :value="item.id" @change="checkStatus(cq.id)" ></b-radio> <span> {{ idToName(item.id)}}.</span>{{item.title}}
                             </div>
                         </div>
                           <div  class="tz-text-left">
-                                解析: {{ cq.item.analysis}}
+                            <div class="tz-answer">
+                                <div>正确答案： {{getRightAnswer(cq.item)}}</div>
+                                <div  class="right_answer">我的答案： {{getMyAnswer(cq.item.id,0)}}</div>
+                            </div>
+                              <div>  解析: {{ cq.item.analysis}} </div>
                          </div>
                     </div>
-                    <div>
+                    <div class="q_split">
                         <a name="multi" />
                         多选题（共<span>{{multiInfo.size}}</span>题,每题<span>{{multiInfo.score}}</span>分,共<span>{{ multiInfo.sumScore}}</span>分）
                     </div>
@@ -101,17 +104,22 @@
                         <div v-if="!!cq.item" class="question-stem" >
                              {{cq.id}}.{{cq.item.stem}}
                         </div>
-                         <div  class="tz-text-left">我的选项： {{getMyAnswer(cq.item.id,0)}}</div>
+                         
                         <div  v-if="!!cq.item&&cq.item.questionType == 2">
                             <div v-for="item in cq.item.answerList" :key="item.id" class="question">
                                 <b-check disabled v-model="cq.item.answerId"  :value="item.id" @change="checkStatus(cq.id)" ></b-check> <span> {{ idToName(item.id)}}.</span>{{item.title}}
                             </div>
                         </div>
+                       
                          <div  class="tz-text-left">
-                                解析: {{ cq.item.analysis}}
+                            <div class="tz-answer">
+                                <div>正确答案： {{getRightAnswer(cq.item)}}</div>
+                                <div  class="right_answer">我的答案： {{getMyAnswer(cq.item.id,0)}}</div>
+                            </div>
+                            <div>   解析: {{ cq.item.analysis}}</div>
                          </div>
                     </div>
-                    <div>
+                    <div class="q_split">
                         <a name="judge" />
                         判断题（共<span>{{judgeInfo.size}}</span>题,每题<span>{{judgeInfo.score}}</span>分,共<span>{{judgeInfo.sumScore}}</span>分）
                     </div>
@@ -120,18 +128,22 @@
                         <div v-if="!!cq.item" class="question-stem" >
                              {{cq.id}}.{{cq.item.stem}}
                         </div>
-                         <div  class="tz-text-left">我的选项： {{getMyAnswer(cq.item.id,0)}}</div>
+                         
                         <div  v-if="!!cq.item&&cq.item.questionType == 3">
                             <div v-for="item in cq.item.answerList" :key="item.id" class="question">
                                 <b-radio disabled  v-model="cq.item.answerId" :value="item.id" @change="checkStatus(cq.id)" ></b-radio> <span> {{ idToName(item.id)}}.</span>{{item.title}}
                             </div>
                         </div>
                          <div  class="tz-text-left">
-                                解析: {{ cq.item.analysis}}
+                            <div class="tz-answer">
+                                <div>正确答案： {{getRightAnswer(cq.item)}}</div>
+                                <div  class="right_answer">我的答案： {{getMyAnswer(cq.item.id,0)}}</div>
+                            </div>
+                              <div>  解析: {{ cq.item.analysis}} </div>
                          </div>
                     </div>
 
-                    <div>
+                    <div class="q_split">
                         <a name="anli" />
                         案例题（共<span>{{anliInfo.size}}</span>题,每题<span>{{anliInfo.score}}</span>分,共<span>{{anliInfo.sumScore}}</span>分）
                     </div>
@@ -148,7 +160,7 @@
                             <div class="question-stem">
                                 {{subcq.id}}.{{subcq.stem}}
                             </div>
-                             <div  class="tz-text-left">我的选项： {{getMyAnswer(cq.item.id,subcq.id)}}</div>
+                             <!-- <div  class="tz-text-left">我的选项： {{getMyAnswer(cq.item.id,subcq.id)}}</div> -->
                             <div  v-if="subcq.questionType == 1 || subcq.questionType ==3 ">
                                 <div v-for="subitem in subcq.answerList" :key="subitem.id" class="question">
                                     <b-radio disabled v-model="subcq.answerId" :name="cq.id+'_'+subcq.id+''" :value="subitem.id"  ></b-radio> <span> {{ idToName(subitem.id)}}.</span>{{subitem.title}}
@@ -160,9 +172,16 @@
                                     <b-check disabled v-model="subcq.answerId" :name="cq.id+'_'+subcq.id+''" :value="subitem.id" ></b-check> <span> {{ idToName(subitem.id)}}.</span>{{subitem.title}}
                                 </div>
                             </div>
-                             <div class="tz-text-left">
-                                解析: {{ subcq.analysis}}
+                            <div  class="tz-text-left">
+                            <div class="tz-answer">
+                                <div>正确答案： {{getRightAnswer(cq.item)}}</div>
+                                <div  class="right_answer">我的答案： {{getMyAnswer(cq.item.id,subcq.id)}}</div>
                             </div>
+                              <div>  解析: {{ subcq.analysis}}</div>
+                         </div>
+                            <!-- <div class="tz-text-left">
+                                解析: {{ subcq.analysis}}
+                            </div> -->
                         </div>
 
                     </div>
@@ -407,6 +426,19 @@ export default {
            }
             return ''
         },
+        getRightAnswer(item,subId){
+            
+            var rs = ''
+            if(item.answerId instanceof Array){
+                item.answerId.forEach((id)=>{
+                    rs += this.idToName(id)
+                })
+            }else{
+                rs = this.idToName(item.answerId)
+            }
+           
+            return rs
+        },
         initQuestionInfo(){
             this.singleInfo.size =  this.singleQuestion.length
             this.judgeInfo.size = this.judgeQuestion.length
@@ -614,9 +646,9 @@ export default {
     display: inline-block;
     border-radius: 5px;
     color: black;
-    padding: .5rem;
-    margin-top: 0.5rem;
-    margin-right: .5rem;
+    padding: .3rem;
+    margin-top: 0.3rem;
+    margin-right: .3rem;
 }
 .tz-exam-box-tips{
     text-align: left;
@@ -694,4 +726,19 @@ export default {
     margin-top: 1rem;
     color: #476083;
 }
+.q_split {
+    background-color: #0264d2;
+    color: white;
+    padding: 5px;
+}
+.right_answer {
+    color: #3300cc;
+}
+.tz-answer{
+    display: flex;
+}
+.tz-answer div {
+    width: 50%;
+
+}
 </style>
\ No newline at end of file