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

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

@@ -20,10 +20,8 @@
             </span>
             <el-input
               v-model="item.content"
-              :placeholder="
-                data.property.answer_mode === 'select'
-                  ? '拼音间用空格隔开，如：ni3 hao3'
-                  : '拼音间用空格隔开，如：ni3 ha3o'
+              placeholder="
+                拼音间用空格隔开，如：ni3 hao3
               "
               @blur="handleItemAnswer(item)"
               @change="changePinyin(item)"
@@ -355,12 +353,29 @@ export default {
             select_item += `${items_trim.substring(indexs, indexs + 1)}${index === content_arr.length - 1 ? '' : ' '}`;
           } else if (this.data.property.answer_mode === 'label') {
             // 如果是标注声调 把声调放在对应字母后面
-            select_item += `${items_trim}${index === content_arr.length - 1 ? '' : ' '}`;
+            // select_item += `${items_trim}${index === content_arr.length - 1 ? '' : ' '}`;
           }
-          content_preview += `${items_yuan} `;
+          content_preview += `${items_yuan}${index === content_arr.length - 1 ? '' : ' '}`;
           this.handleReplaceTone(items_yuan + items_trim.substring(indexs, indexs + 1), item.mark, itemIndex);
         }
       });
+      if (this.data.property.answer_mode === 'label') {
+        content_preview.split(' ').forEach((items, index) => {
+          let items_trim = items.trim();
+          if (items_trim) {
+            let indexs = content_arr[index].search(/0|1|2|3|4/);
+            let items_tone = this.matically_pinyin_str[item.mark].split(' ')[index].split('');
+            for (let i = 0; i < items_trim.length; i++) {
+              if (items_trim[i] === items_tone[i]) {
+                select_item += `${items_trim[i]}`;
+              } else {
+                select_item += `${items_trim[i]}${content_arr[index].substring(indexs, indexs + 1)}`;
+              }
+            }
+            select_item += `${index === content_preview.split(' ').length - 1 ? '' : ' '}`;
+          }
+        });
+      }
       if (itemIndex === -1) {
         let obj = {
           mark: item.mark,

src/views/exercise_questions/preview/WritePictruePreview.vue

@@ -91,7 +91,7 @@ export default {
   mixins: [PreviewMixin],
   data() {
     return {
-      show_sample_text: false,
+      show_sample_text: true,
       pic_list: {},
       active_index: 0,
       show_preview: false,

src/views/exercise_questions/preview/WritePreview.vue

@@ -67,7 +67,7 @@ export default {
   mixins: [PreviewMixin],
   data() {
     return {
-      show_sample_text: false,
+      show_sample_text: true,
     };
   },
   watch: {