Merge branch 'master' of http://60.205.254.193:3000/GCLS/GCLS_Page_Exercise

src/views/exercise_questions/create/components/exercises/ChineseQuestion.vue

@@ -234,7 +234,6 @@ export default {
           .then((res) => {
             item.loading = false;
             if (res.status === 1) {
-              this.data.file_id_list.splice(this.data.file_id_list.indexOf(item.file_id), 1);
               item.audio_file_id = res.file_id;
               this.data.file_id_list.push(res.file_id);
             }

src/views/exercise_questions/create/components/exercises/ChooseToneQuestion.vue

@@ -30,7 +30,11 @@
             <span class="question-number" title="双击切换序号类型" @dblclick="changeOptionType(data)">
               {{ computedQuestionNumber(i, data.option_number_show_mode) }}
             </span>
-            <el-input v-model="item.content" placeholder="输入内容" @blur="handleItemAnswer(item)" />
+            <el-input
+              v-model="item.content"
+              placeholder="拼音间用空格隔开，如：ni3 ha3o"
+              @blur="handleItemAnswer(item)"
+            />
             <UploadAudio
               v-if="data.other.audio_generation_method === 'upload'"
               :key="item.audio_file_id || i"
@@ -211,7 +215,6 @@ export default {
           .then((res) => {
             item.loading = false;
             if (res.status === 1) {
-              this.data.file_id_list.splice(this.data.file_id_list.indexOf(item.file_id), 1);
               item.audio_file_id = res.file_id;
               this.data.file_id_list.push(res.file_id);
             }

src/views/exercise_questions/create/components/exercises/ReplaceAnswerQuestion.vue

@@ -95,7 +95,7 @@
           <el-input-number
             :min="1"
             :step="1"
-            v-model="data.property.rows_number"
+            v-model="data.property.row_count"
             class="word-num-input"
             :precision="0"
             @change="handleChangeRows"

src/views/exercise_questions/create/components/exercises/WordCardQuestion.vue

@@ -260,7 +260,6 @@ export default {
           .then((res) => {
             item.loading = false;
             if (res.status === 1) {
-              this.data.file_id_list.splice(this.data.file_id_list.indexOf(item.file_id), 1);
               item.audio_file_id = res.file_id;
               this.data.file_id_list.push(res.file_id);
             }

src/views/exercise_questions/data/replaceAnswer.js

@@ -25,7 +25,7 @@ export const replaceAnswerData = {
     is_enable_description: 'false', // 描述
     score: 1, // 分值
     score_type: scoreTypeList[0].value, // 分值类型
-    rows_number: 4,
+    row_count: 4,
   },
   // 其他属性
   other: {

src/views/exercise_questions/preview/AnswerQuestionPreview.vue

@@ -9,7 +9,7 @@
     <AudioPlay v-if="data.file_id_list.length > 0" :file-id="data.file_id_list[0]" />
 
     <SoundRecordPreview :wav-blob.sync="answer.answer_list[0].audio_file_id" />
-    <div v-if="isEnable(data.property.is_enable_reference_answer)" class="reference-box">
+    <div v-if="isEnable(data.property.is_enable_reference_answer) && isShowRightAnswer" class="reference-box">
       <h5 class="reference-title">参考答案</h5>
       <span class="reference-answer" v-html="sanitizeHTML(data.reference_answer)"></span>
     </div>

src/views/exercise_questions/preview/ChinesePreview.vue

@@ -247,8 +247,6 @@ export default {
         };
         this.answer_list.push(obj);
       });
-      console.log(this.data);
-      console.log(this.answer_list);
     },
     changePraShow() {
       this.if_free_show = false;

src/views/exercise_questions/preview/ChooseTonePreview.vue

@@ -47,12 +47,12 @@
             con_preview[i].user_answer[con_preview[i].item_active_index].select_tone === value
               ? 'active'
               : data.property.answer_mode === 'label' &&
-                con_preview[i].user_answer[con_preview[i].item_active_index] &&
-                con_preview[i].user_answer[con_preview[i].item_active_index].select_tone === value &&
-                con_preview[i].user_answer[con_preview[i].item_active_index].select_letter === active_letter &&
-                select_item_index === i
-              ? 'active'
-              : '',
+                  con_preview[i].user_answer[con_preview[i].item_active_index] &&
+                  con_preview[i].user_answer[con_preview[i].item_active_index].select_tone === value &&
+                  con_preview[i].user_answer[con_preview[i].item_active_index].select_letter === active_letter &&
+                  select_item_index === i
+                ? 'active'
+                : '',
           ]"
           @click="chooseTone(con_preview[i], value, i)"
         >
@@ -158,7 +158,6 @@ export default {
         };
         this.con_preview.push(obj);
       });
-      console.log(this.con_preview);
     },
     handleReplaceTone(e) {
       this.$nextTick(() => {

src/views/exercise_questions/preview/EssayQuestionPreview.vue

@@ -27,7 +27,7 @@
       @upload="handleUpload"
       @deleteFile="handleDelete"
     />
-    <div v-if="isEnable(data.property.is_enable_reference_answer)" class="reference-box">
+    <div v-if="isEnable(data.property.is_enable_reference_answer) && isShowRightAnswer" class="reference-box">
       <h5 class="reference-title">参考答案</h5>
       <span class="reference-answer" v-html="sanitizeHTML(data.reference_answer)"></span>
     </div>

src/views/exercise_questions/preview/ReplaceAnswerPreview.vue

@@ -9,16 +9,16 @@
     <div class="option-list">
       <div v-for="(item, i) in option_list" :key="i" :class="['option-item']">
         <template v-if="item.length > 1">
-          <!-- <el-select v-model="answer.answer_list[0].select_mark[i]" placeholder="请选择">
+          <!-- <el-select v-model="answer.answer_list[0].mark_list[i]" placeholder="请选择">
             <el-option v-for="items in item" :key="items.content" :label="items.content" :value="items.content">
             </el-option>
           </el-select> -->
           <span class="select-item select-active">{{ active_content[i] }}</span>
           <ul :ref="'ui' + i" class="replace-ul" @scroll="handleScroll($event, i)">
             <li
+              :class="[answer.answer_list[0].select_mark[i] === items.mark ? 'active' : '']"
               v-for="(items, indexs) in item"
               :key="indexs"
-              :class="[answer.answer_list[0].select_mark[i] === items.mark ? 'active' : '']"
               @click="handleClickItem(i, indexs)"
             >
               {{ items.content }}
@@ -46,15 +46,15 @@ export default {
   data() {
     return {
       computeOptionMethods,
-      answer: {
-        answer_list: [
-          {
-            audio_file_id: '',
-            select_mark: [],
-          },
-        ],
-        option_list: [],
-      },
+      // answer: {
+      //   answer_list: [
+      //     {
+      //       audio_file_id: '',
+      //       mark_list: [],
+      //     },
+      //   ],
+      // },
+      option_list: [],
       active_content: [],
     };
   },
@@ -70,7 +70,7 @@ export default {
       this.answer.answer_list = [
         {
           audio_file_id: '',
-          select_mark: [],
+          mark_list: [],
         },
       ];
       let option_lists = [[], [], [], []];
@@ -84,7 +84,7 @@ export default {
       option_lists.forEach((option_item) => {
         if (option_item.length > 0) {
           this.option_list.push(option_item);
-          this.answer.answer_list[0].select_mark.push(option_item.length > 1 ? option_item[0].mark : '');
+          this.answer.answer_list[0].mark_list.push(option_item.length > 1 ? option_item[0].mark : '');
           this.active_content.push(option_item.length > 1 ? option_item[0].content : '');
         }
       });
@@ -94,14 +94,13 @@ export default {
       let scrollTop = event.target.scrollTop;
       let scrollIndex = Math.round(scrollTop / 48);
       this.active_content[i] = this.option_list[i][scrollIndex].content;
-      this.answer.answer_list[0].select_mark[i] = this.option_list[i][scrollIndex].mark;
+      this.answer.answer_list[0].mark_list[i] = this.option_list[i][scrollIndex].mark;
       this.$forceUpdate();
     },
     handleClickItem(i, indexs) {
-      console.log(this.$refs[`ui${i}`][0].scrollTop);
-      this.$refs[`ui${i}`][0].scrollTop = indexs * 48;
+      this.$refs['ui' + i][0].scrollTop = indexs * 48;
       this.active_content[i] = this.option_list[i][indexs].content;
-      this.answer.answer_list[0].select_mark[i] = this.option_list[i][indexs].mark;
+      this.answer.answer_list[0].mark_list[i] = this.option_list[i][indexs].mark;
       this.$forceUpdate();
     },
   },

src/views/exercise_questions/preview/SortPreview.vue

@@ -12,7 +12,7 @@
       :options="{
         group: { name: 'itxst', pull: 'clone' },
       }"
-      :sort="task_model == 'ANSWER' ? false : true"
+      :sort="!isJudgingRightWrong"
       :class="['content-box', 'content-box-' + data.property.layout_type]"
       @start="onStart($event)"
       @end="onEnd($event)"
@@ -57,8 +57,6 @@ export default {
   mixins: [PreviewMixin],
   data() {
     return {
-      task_model: '', // 答题模式
-      answer_list: [], // 存储用户答题
       move_list: [], // 移动后的数组
       drag: false,
       click_index_list: [], // 点击选中的索引
@@ -69,7 +67,7 @@ export default {
     move_list: {
       handler(val) {
         if (!val) return;
-        this.answer_list = val.map(({ mark }) => {
+        this.answer.answer_list = val.map(({ mark }) => {
           return mark;
         });
       },

src/views/exercise_questions/preview/TalkPictruePreview.vue

@@ -21,7 +21,7 @@
           <SoundRecordPreview :wav-blob.sync="answer_list[index].audio_file_id" type="small" />
         </div>
 
-        <div v-if="isEnable(data.property.is_enable_reference_answer)" class="reference-box">
+        <div v-if="isEnable(data.property.is_enable_reference_answer) && isShowRightAnswer" class="reference-box">
           <h5 class="reference-title">参考答案</h5>
           <span class="reference-answer" v-html="sanitizeHTML(item.reference_answer)"></span>
         </div>

src/views/exercise_questions/preview/WordCardPreview.vue

@@ -238,7 +238,6 @@ export default {
 
   .definition {
     margin: 0 0 8px;
-    font-family: 'PingFang SC';
     font-size: 16px;
     line-height: 24px;
     color: #000;

src/views/exercise_questions/preview/WritePictruePreview.vue

@@ -51,7 +51,7 @@
         v-if="answer_list[active_index]"
       />
     </template>
-    <template v-if="isEnable(data.property.is_enable_sample_text)">
+    <template v-if="isEnable(data.property.is_enable_sample_text) && isShowRightAnswer">
       <el-divider content-position="center"
         ><span
           :class="['sample-text', show_sample_text ? 'sample-show' : 'sample-hide']"

src/views/exercise_questions/preview/WritePreview.vue

@@ -33,7 +33,7 @@
         @deleteFile="handleDelete"
       />
     </template>
-    <template v-if="isEnable(data.property.is_enable_sample_text)">
+    <template v-if="isEnable(data.property.is_enable_sample_text) && isShowRightAnswer">
       <el-divider content-position="center"
         ><span
           :class="['sample-text', show_sample_text ? 'sample-show' : 'sample-hide']"

src/views/exercise_questions/preview/components/common/FreewriteLettle.vue

@@ -422,7 +422,6 @@ export default {
 
   > span {
     margin-bottom: 9px;
-    font-family: 'FZJCGFKTK';
     font-size: 24px;
     font-weight: 600;
     line-height: 34px;