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

src/views/exercise_questions/preview/WritePictruePreview.vue

@@ -67,7 +67,11 @@
           >{{ show_sample_text ? '隐藏范文' : '查看范文' }}</span
         ></el-divider
       >
-      <div v-if="show_sample_text" class="article-content rich-text" v-html="sanitizeHTML(data.sample_text)"></div>
+      <div
+        v-if="show_sample_text"
+        class="article-content rich-text"
+        v-html="sanitizeHTML(this.show_sample_break)"
+      ></div>
     </template>
 
     <div v-if="isEnable(data.property.is_enable_analysis) && isShowRightAnswer" class="analysis">
@@ -95,6 +99,7 @@ export default {
       pic_list: {},
       active_index: 0,
       show_preview: false,
+      show_sample_break: '',
     };
   },
   watch: {
@@ -125,6 +130,7 @@ export default {
         };
         this.answer.answer_list.push(obj);
       }
+      this.show_sample_break = this.data.sample_text ? this.data.sample_text.replace(/#/g, '</p><p>') : '';
     },
     changeImg(index) {
       this.active_index = index;
@@ -228,6 +234,10 @@ export default {
     }
   }
 
+  .article-content {
+    text-indent: 2em;
+  }
+
   .write-input {
     font-size: 16px;
   }

src/views/exercise_questions/preview/WritePreview.vue

@@ -45,7 +45,11 @@
           >{{ show_sample_text ? '隐藏范文' : '查看范文' }}</span
         ></el-divider
       >
-      <div v-if="show_sample_text" class="article-content rich-text" v-html="sanitizeHTML(data.sample_text)"></div>
+      <div
+        v-if="show_sample_text"
+        class="article-content rich-text"
+        v-html="sanitizeHTML(this.show_sample_break)"
+      ></div>
     </template>
 
     <div v-if="isEnable(data.property.is_enable_analysis) && isShowRightAnswer" class="analysis">
@@ -68,6 +72,7 @@ export default {
   data() {
     return {
       show_sample_text: true,
+      show_sample_break: '',
     };
   },
   watch: {
@@ -85,6 +90,7 @@ export default {
     data: {
       handler(val) {
         if (!val || this.data.type !== 'write') return;
+        this.show_sample_break = val.sample_text ? val.sample_text.replace(/#/g, '</p><p>') : '';
       },
       deep: true,
       immediate: true,
@@ -141,6 +147,10 @@ export default {
     }
   }
 
+  .article-content {
+    text-indent: 2em;
+  }
+
   .write-input {
     font-size: 16px;
   }