Merge branch 'master' into lhd

src/views/exercise_questions/create/components/common/QuestionMixin.js

@@ -28,6 +28,14 @@ const mixin = {
     RichText,
     AudioPlay,
   },
+  watch: {
+    'data.property.score'(val) {
+      this.data.answer.score = val;
+    },
+    'data.property.score_type'(val) {
+      this.data.answer.score_type = val;
+    },
+  },
   methods: {
     upload(file_id) {
       this.data.file_id_list.push(file_id);

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

@@ -27,6 +27,7 @@
         <RichText v-model="data.article" placeholder="输入文章" />
       </div>
     </template>
+
     <template #property>
       <el-form :model="data.property">
         <el-form-item label="题干">

src/views/exercise_questions/data/read.js

@@ -1,14 +1,12 @@
-import { optionTypeList, stemTypeList, scoreTypeList, questionNumberTypeList } from './common';
+import { stemTypeList, scoreTypeList, questionNumberTypeList } from './common';
 
 // 阅读题数据模板
 export const readData = {
   type: 'read', // 题型
   stem: '', // 题干
-  option_number_show_mode: optionTypeList[0].value, // 选项类型
   description: '', // 描述
   article: '', // 文章
-  sample_text: '', // 范文
-  answer: { answer_list: [], score: 0, score_type: scoreTypeList[0].value }, // 答案
+  answer: { score: 0, score_type: scoreTypeList[0].value }, // 答案
   question_list: [], // 题目列表
   // 题型属性
   property: {

src/views/exercise_questions/preview/DialoguePreview.vue

@@ -10,7 +10,7 @@
       <ul>
         <li v-for="(item, i) in dialogue" :key="i" :style="{ flexDirection: item.dir }" class="dialogue-item">
           <span class="name">{{ item.name }}</span>
-          <div class="content">
+          <div class="content" :style="{ backgroundColor: item.dir === 'row' ? '#fff' : '#d0f3de' }">
             <template v-if="item.type === 'text'">
               {{ item.content }}
             </template>
@@ -115,7 +115,6 @@ export default {
         .content {
           padding: 8px 16px;
           color: #000;
-          background-color: #fff;
           border-radius: 8px;
         }
       }

src/views/exercise_questions/preview/ReadAloudPreview.vue

@@ -30,10 +30,8 @@ export default {
   data() {
     return {
       user_answer: {
-        text: '', // 用户文章
         voice_file_id: '', // 录音文件id
         audio_wav_time: 0, // 录音时间
-        accessory_file_id: [], // 上传文件列表
       },
     };
   },