From c7f51a10dc5ac744962af082f3eb4f03a18fb98b Mon Sep 17 00:00:00 2001
From: cgd_mac <349008059@qq.com>
Date: Thu, 13 Jan 2022 22:55:58 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=88=91=E7=9A=84=E7=BB=83=E4=B9=A0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/practice/practice.js                | 11 ++++-
 src/components/DbQuestionInfoItem/index.vue | 16 +++----
 src/components/DbQuestionItem/index.vue     |  2 +-
 src/views/mycollection/index.vue            |  2 +-
 src/views/myexamDetail/index.vue            | 46 +++++++++++++++++++--
 5 files changed, 63 insertions(+), 14 deletions(-)

diff --git a/src/api/practice/practice.js b/src/api/practice/practice.js
index 34a917e..26f5a3d 100644
--- a/src/api/practice/practice.js
+++ b/src/api/practice/practice.js
@@ -8,7 +8,16 @@ const practiceApi = {
     collectionList: 'practice/collection/pageList', // 我的收藏列表
     recordList: 'practice/record/pageList', // 答题记录
     wrongList: 'practice/wrong/pageList', // 错题集
-    startAnswer: 'practice/startAnswer' // 开始答题
+    startAnswer: 'practice/startAnswer', // 开始答题
+    executeSubmit: 'practice/executeSubmit', // 练习交卷
+}
+
+export function practiceExecuteSubmit(data) {
+    return request({
+        url: practiceApi.executeSubmit,
+        method: 'post',
+        data: data
+    })
 }
 
 export function practiceStartAnswer(params) {
diff --git a/src/components/DbQuestionInfoItem/index.vue b/src/components/DbQuestionInfoItem/index.vue
index f1a09ac..cf076d9 100644
--- a/src/components/DbQuestionInfoItem/index.vue
+++ b/src/components/DbQuestionInfoItem/index.vue
@@ -2,20 +2,20 @@
   <div class="question-item">
     <div class="question-title">
       <span>{{ questionIndex || 1 }}、</span>
-      <span>({{ type | QuestionTypeFormat }})</span>
-      <span v-html="title"></span>
+      <span>({{ $getQuestionTypeText(data.questionType) }})</span>
+      <span v-html="data.questionName"></span>
     </div>
     <div class="options-box">
       <ul class="answer-list">
         <!-- <li :class="{'success-li' : index == 2}" v-for="(item, index) in options" :key="index">
           <span>{{ optionKeys[index] }}、</span>{{ item.label }}
         </li> -->
-        <li v-if="data.answerA || data.answerA === 0" :class="{'success-li' : data.rightAnswers == 'A'}"><span>A、</span>{{ data.answerA }}</li>
-        <li v-if="data.answerB || data.answerB === 0" :class="{'success-li' : data.rightAnswers == 'B'}"><span>B、</span>{{ data.answerB }}</li>
-        <li v-if="data.answerC || data.answerC === 0" :class="{'success-li' : data.rightAnswers == 'C'}"><span>C、</span>{{ data.answerC }}</li>
-        <li v-if="data.answerD || data.answerD === 0" :class="{'success-li' : data.rightAnswers == 'D'}"><span>D、</span>{{ data.answerD }}</li>
-        <li v-if="data.answerE || data.answerE === 0" :class="{'success-li' : data.rightAnswers == 'E'}"><span>E、</span>{{ data.answerE }}</li>
-        <li v-if="data.answerF || data.answerF === 0" :class="{'success-li' : data.rightAnswers == 'F'}"><span>F、</span>{{ data.answerF }}</li>
+        <li v-if="data.answerA || data.answerA === 0" :class="{'success-li' : data.rightAnswers.indexOf('A') !== -1}"><span>A、</span>{{ data.answerA }}</li>
+        <li v-if="data.answerB || data.answerB === 0" :class="{'success-li' : data.rightAnswers.indexOf('B') !== -1}"><span>B、</span>{{ data.answerB }}</li>
+        <li v-if="data.answerC || data.answerC === 0" :class="{'success-li' : data.rightAnswers.indexOf('C') !== -1}"><span>C、</span>{{ data.answerC }}</li>
+        <li v-if="data.answerD || data.answerD === 0" :class="{'success-li' : data.rightAnswers.indexOf('D') !== -1}"><span>D、</span>{{ data.answerD }}</li>
+        <li v-if="data.answerE || data.answerE === 0" :class="{'success-li' : data.rightAnswers.indexOf('E') !== -1}"><span>E、</span>{{ data.answerE }}</li>
+        <li v-if="data.answerF || data.answerF === 0" :class="{'success-li' : data.rightAnswers.indexOf('F') !== -1}"><span>F、</span>{{ data.answerF }}</li>
       </ul>
     </div>
     <div class="flex-center justify-between" style="margin-top: 10px;">
diff --git a/src/components/DbQuestionItem/index.vue b/src/components/DbQuestionItem/index.vue
index 628526e..9fdcccd 100644
--- a/src/components/DbQuestionItem/index.vue
+++ b/src/components/DbQuestionItem/index.vue
@@ -3,7 +3,7 @@
     <div class="question-title">
       <span>{{ index || 1 }}、</span>
       <span>({{ $getQuestionTypeText(type) }})</span>
-      <span v-html="title"></span>
+      <span v-html="data.questionName"></span>
     </div>
     <div class="options-box">
       <!-- 单选题选项 -->
diff --git a/src/views/mycollection/index.vue b/src/views/mycollection/index.vue
index cdac1a6..8d7ec76 100644
--- a/src/views/mycollection/index.vue
+++ b/src/views/mycollection/index.vue
@@ -22,7 +22,7 @@
           <template v-if="wrongInfo.list && wrongInfo.list.length>0">
             <template v-for="(item, index) in wrongInfo.list" >
               <div :key="index">
-                <DbQuestionInfoItem :questionIndex="index+1" ></DbQuestionInfoItem>
+                <DbQuestionInfoItem :data="item" :questionIndex="index+1" ></DbQuestionInfoItem>
                 <a-divider></a-divider>
               </div>
             </template>
diff --git a/src/views/myexamDetail/index.vue b/src/views/myexamDetail/index.vue
index 1796913..24564ed 100644
--- a/src/views/myexamDetail/index.vue
+++ b/src/views/myexamDetail/index.vue
@@ -6,7 +6,8 @@
 
 <script>
 import DbExam from '@/components/DbExam/index'
-import { practiceStartAnswer } from '@/api/practice/practice'
+import { practiceStartAnswer, practiceExecuteSubmit } from '@/api/practice/practice'
+import _ from 'lodash'
 export default {
     components: { DbExam },
     data () {
@@ -38,8 +39,47 @@ export default {
         })
       },
       // 提交
-      handlerSubmit (data) {
-        console.log('this.data', data)
+      handlerSubmit (result) {
+        const { type } = this.query
+        if (type === 'practice') {
+          this.submitPractice(result)
+        }
+      },
+      // 提交练习
+      submitPractice (result) {
+        const data = { ...result }
+        const query = this.query
+        const params = {
+          projectId: query.projectId,
+          courseId: query.courseId,
+          answerTime: 0,
+          type: query.practiceType,
+          questionList: []
+        }
+        const allQuestion = []
+        const question = data.question
+        if (question && question.length > 0) {
+          question.map(item => {
+            if (item.questionList && item.questionList.length > 0) {
+              item.questionList.map(j => {
+                let myAnswers = j.myAnswers
+                if (item.type != 2 && _.isArray(myAnswers)) {
+                  myAnswers = myAnswers.join(',')
+                }
+                allQuestion.push({
+                  questionId: j.questionId,
+                  answerTime: 0,
+                  myAnswers: myAnswers
+                })
+              })
+            }
+          })
+        }
+        params.questionList = allQuestion
+        practiceExecuteSubmit(params).then(() => {
+          this.$message.success('交卷成功!')
+          this.$router.go(-1)
+        })
       }
     }
 }