natasha 1 year ago
parent
commit
f4f0b9935e

+ 1 - 12
src/views/exercise_questions/create/components/exercises/ChooseToneQuestion.vue

@@ -207,18 +207,7 @@ export default {
         let items_trim = items.trim();
         if (items_trim) {
           let items_yuan = JSON.parse(JSON.stringify(items_trim)).replace(/0|1|2|3|4/, '');
-          let indexs = -1;
-          if (items.indexOf('0') > -1) {
-            indexs = items.indexOf('0');
-          } else if (items.indexOf('1') > -1) {
-            indexs = items.indexOf('1');
-          } else if (items.indexOf('2') > -1) {
-            indexs = items.indexOf('2');
-          } else if (items.indexOf('3') > -1) {
-            indexs = items.indexOf('3');
-          } else if (items.indexOf('4') > -1) {
-            indexs = items.indexOf('4');
-          }
+          let indexs = items.search(/0|1|2|3|4/);
           if (this.data.property.answer_mode === 'select') {
             // 如果是选择声调 把声调放在拼音后面
             // select_item += `${items_yuan + items_trim.substring(indexs, indexs + 1)} `;

+ 3 - 1
src/views/exercise_questions/preview/ChooseTonePreview.vue

@@ -130,12 +130,13 @@ export default {
     handleData() {
       this.con_preview = [];
       this.data.option_list.forEach((item) => {
-        let con_arr = item.content_view;
+        let con_arr = JSON.parse(JSON.stringify(item.content_view));
         let user_answer = [];
         con_arr.forEach(() => {
           user_answer.push({
             select_tone: null,
             select_letter: '',
+            select_index: '',
           });
         });
         let obj = {
@@ -245,6 +246,7 @@ export default {
     },
     handleSelectItemTone(i, indexc, indexi, itemi) {
       this.con_preview[i].item_active_index = indexc;
+      this.con_preview[i].user_answer[indexc].select_index = indexi;
       this.active_index_str = `${i}-${indexc}-${indexi}`;
       this.active_letter = itemi;
       this.active_letter_index = indexi;

+ 8 - 2
src/views/exercise_questions/preview/WritePreview.vue

@@ -5,7 +5,7 @@
       <span class="question-number">{{ data.property.question_number }}.</span>
       <span v-html="sanitizeHTML(data.stem)"></span>
     </div>
-    <div v-html="sanitizeHTML(data.article)"></div>
+    <div class="article-content" v-html="sanitizeHTML(data.article)"></div>
     <div v-if="data.property.is_enable_description" class="description">{{ data.description }}</div>
     <template v-if="data.property.is_enable_model_essay">
       <el-divider content-position="center"
@@ -15,7 +15,7 @@
           >{{ show_sample_text ? '隐藏范文' : '查看范文' }}</span
         ></el-divider
       >
-      <div v-if="show_sample_text" v-html="sanitizeHTML(data.sample_text)"></div>
+      <div v-if="show_sample_text" class="article-content" v-html="sanitizeHTML(data.sample_text)"></div>
     </template>
   </div>
 </template>
@@ -59,5 +59,11 @@ export default {
       color: #306eff;
     }
   }
+
+  .article-content {
+    :deep p {
+      margin: 0;
+    }
+  }
 }
 </style>