From fe9bf9b495671b6b0463cec83c7d148d384ada70 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Mon, 17 Oct 2022 14:04:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../competitionManage/bankList/index.vue      |  5 +-
 .../bankList/previewAnswer.vue                | 60 ++++++++++++++-----
 2 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/src/views/competitionManage/bankList/index.vue b/src/views/competitionManage/bankList/index.vue
index 0128b0ad5..389f87a87 100644
--- a/src/views/competitionManage/bankList/index.vue
+++ b/src/views/competitionManage/bankList/index.vue
@@ -39,7 +39,7 @@ export default {
                         type: 'select',
                         label: '类 型',
                         config: {
-                            data: this.$ConstSelect.QuestionTypeList
+                            data: this.$ConstSelect.QuestionTypeList.filter(item => { return !['fill', 'answer'].includes(item.value); })
                         }
                     },
                     topic: {
@@ -63,7 +63,8 @@ export default {
                 columns: [
                     {
                         title: '题 目',
-                        prop: 'topic'
+                        prop: 'topic',
+                        type: 'html'
                     },
                     {
                         title: '标 签',
diff --git a/src/views/competitionManage/bankList/previewAnswer.vue b/src/views/competitionManage/bankList/previewAnswer.vue
index cab30fbc3..f2c43ccb4 100644
--- a/src/views/competitionManage/bankList/previewAnswer.vue
+++ b/src/views/competitionManage/bankList/previewAnswer.vue
@@ -1,13 +1,14 @@
 <template>
   <el-dialog v-dialogDrag :close-on-click-moda="false" :title="title" :visible.sync="show" width="860px" :close-on-click-modal="false" :before-close="doClose">
-    <div class="ql-editor" v-html="$escapeHTML(`题 目:  ${form.topic}`)" />
+    <div class="ql-editor" v-html="$escapeHTML(`【${mapType[type] || ''}】题 目:  ${form.topic}`)" />
     <template v-if="checkType(form, 'judge')">
       <div class="answer">
         答 案:
-        <el-radio-group v-model="active">
-          <el-radio :label="0"> √ </el-radio>
-          <el-radio :label="1"> × </el-radio>
-        </el-radio-group>
+        <div>
+          <el-radio-group v-model="active">
+            <el-radio v-for="(el,i) in options" :key="i" class="option" :label="el.id"> {{ el.content }} </el-radio>
+          </el-radio-group>
+        </div>
       </div>
 
     </template>
@@ -18,9 +19,11 @@
       </div>
       <div class="answer">
         答 案:
-        <el-radio-group v-model="active">
-          <el-radio v-for="(el,i) in options" :key="i" :label="el.id"> {{ $asc2chart(65+i) }} </el-radio>
-        </el-radio-group>
+        <div>
+          <el-radio-group v-model="active">
+            <el-radio v-for="(el,i) in options" :key="i" class="option" :label="el.id"> {{ $asc2chart(65+i) }} </el-radio>
+          </el-radio-group>
+        </div>
       </div>
     </template>
     <template v-else-if="checkType(form, 'multi')">
@@ -31,7 +34,7 @@
       <div class="answer">
         答 案:
         <el-checkbox-group v-model="active">
-          <el-checkbox v-for="(el,i) in options" :key="i" :label="el.id">{{ $asc2chart(65+i) }} </el-checkbox>
+          <el-checkbox v-for="(el,i) in options" :key="i" class="option" :label="el.id">{{ $asc2chart(65+i) }} </el-checkbox>
         </el-checkbox-group>
       </div>
     </template>
@@ -47,9 +50,14 @@
     <template v-else-if="checkType(form, 'answer')">
       <div class="answer">
         答 案:
-        <el-input v-model="active" type="textarea" :autosize="{ minRows: 2, maxRows: 4}" placeholder="请输入答案" />
+        <div>
+          <el-input v-model="active" type="textarea" :autosize="{ minRows: 2, maxRows: 4}" placeholder="请输入答案" />
+        </div>
       </div>
     </template>
+    <div v-if="showAnswer" class="show-answer">
+      <span :class="isCorrect? 'correct': 'error'">{{ isCorrect ? '答案正确！' : '答案错误！' }}</span>
+    </div>
     <span slot="footer" class="dialog-footer">
       <el-button @click="submit(true)">提交</el-button>
       <el-button @click="show = false">关闭</el-button>
@@ -71,6 +79,8 @@ export default {
         return {
             active: '',
             show: false,
+            showAnswer: false,
+            isCorrect: false,
             form: {
                 type: '',
                 optionList: []
@@ -86,10 +96,19 @@ export default {
         },
         type() {
             return this.form.type;
+        },
+        mapType() {
+            const obj = {};
+            const list = this.$ConstSelect.QuestionTypeList;
+            list.forEach(item => {
+                obj[item.value] = item.label;
+            });
+            return obj;
         }
     },
     watch: {
         questionId(val) {
+            this.showAnswer = false;
             this.getQuestionInfo();
         },
         type(val) {
@@ -131,13 +150,10 @@ export default {
             }
             testAnswer(this.questionId, data).then(res => {
                 if (val) {
-                    if (res.data) {
-                        this.$message.success('答案正确！');
-                    } else {
-                        this.$message.warning('答案错误！');
-                    }
+                    this.showAnswer = true;
+                    this.isCorrect = res.data;
                 }
-                this.doClose();
+                // this.doClose();
             }).catch(err => {
                 console.log(err, '===err====');
             });
@@ -159,4 +175,16 @@ export default {
 		color: #000;
 		padding-left: 15px;
 	}
+	.show-answer {
+		padding: 15px;
+		span {
+			font-size: 18px;
+		}
+		.correct {
+			color: green;
+		}
+		.error {
+			color: red;
+		}
+	}
 </style>