Przeglądaj źródła

描述改为提示

dusenyao 1 rok temu
rodzic
commit
74dc7dd665
29 zmienionych plików z 77 dodań i 63 usunięć
  1. 3 2
      src/styles/mixin.scss
  2. 1 1
      src/views/exercise_questions/create/components/exercises/ChineseQuestion.vue
  3. 1 1
      src/views/exercise_questions/create/components/exercises/ChooseToneQuestion.vue
  4. 8 10
      src/views/exercise_questions/create/components/exercises/DialogueQuestion.vue
  5. 2 3
      src/views/exercise_questions/create/components/exercises/EssayQuestion.vue
  6. 1 1
      src/views/exercise_questions/create/components/exercises/FillQuestion.vue
  7. 1 1
      src/views/exercise_questions/create/components/exercises/ListenFillQuestion.vue
  8. 5 6
      src/views/exercise_questions/create/components/exercises/ListenSelectQuestion.vue
  9. 8 7
      src/views/exercise_questions/create/components/exercises/MatchingQuestion.vue
  10. 1 1
      src/views/exercise_questions/create/components/exercises/ReadAloudQuestion.vue
  11. 5 6
      src/views/exercise_questions/create/components/exercises/ReadQuestion.vue
  12. 1 1
      src/views/exercise_questions/create/components/exercises/RepeatQuestion.vue
  13. 1 1
      src/views/exercise_questions/create/components/exercises/ReplaceAnswerQuestion.vue
  14. 4 7
      src/views/exercise_questions/create/components/exercises/SelectQuestion.vue
  15. 1 1
      src/views/exercise_questions/create/components/exercises/ShortAnswerQuestion.vue
  16. 1 1
      src/views/exercise_questions/create/components/exercises/SortQuestion.vue
  17. 1 1
      src/views/exercise_questions/create/components/exercises/TalkPictureQuestion.vue
  18. 1 1
      src/views/exercise_questions/create/components/exercises/WordCardQuestion.vue
  19. 1 1
      src/views/exercise_questions/data/fill.js
  20. 1 1
      src/views/exercise_questions/data/listenFill.js
  21. 1 1
      src/views/exercise_questions/data/listenSelect.js
  22. 1 1
      src/views/exercise_questions/data/matching.js
  23. 1 1
      src/views/exercise_questions/data/read.js
  24. 1 1
      src/views/exercise_questions/data/select.js
  25. 5 1
      src/views/exercise_questions/preview/DialoguePreview.vue
  26. 5 1
      src/views/exercise_questions/preview/ListenSelectPreview.vue
  27. 5 1
      src/views/exercise_questions/preview/MatchingPreview.vue
  28. 5 1
      src/views/exercise_questions/preview/ReadPreview.vue
  29. 5 1
      src/views/exercise_questions/preview/SelectPreview.vue

+ 3 - 2
src/styles/mixin.scss

@@ -14,6 +14,7 @@
   // 富文本格式
   %rich-text,
   .rich-text {
+    font-family: 'Arial', 'Helvetica', sans-serif;
     font-size: 16pt;
   }
 
@@ -21,11 +22,11 @@
   .stem {
     display: flex;
     align-items: flex-start;
+    font-family: 'Arial', 'Helvetica', sans-serif;
+    font-size: 18pt;
     font-weight: bold;
     color: #34343a;
 
-    @extend %rich-text;
-
     .question-number {
       margin-right: 4px;
     }

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

@@ -5,7 +5,7 @@
         <RichText v-model="data.stem" :font-size="18" placeholder="输入题干" />
 
         <RichText
-          v-show="isEnable(data.property.is_enable_description)"
+          v-if="isEnable(data.property.is_enable_description)"
           v-model="data.description"
           placeholder="输入提示"
         />

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

@@ -5,7 +5,7 @@
         <RichText v-model="data.stem" :font-size="18" placeholder="输入题干" />
 
         <RichText
-          v-show="isEnable(data.property.is_enable_description)"
+          v-if="isEnable(data.property.is_enable_description)"
           v-model="data.description"
           placeholder="输入提示"
         />

+ 8 - 10
src/views/exercise_questions/create/components/exercises/DialogueQuestion.vue

@@ -4,13 +4,10 @@
       <div class="stem">
         <RichText v-model="data.stem" :font-size="18" placeholder="输入题干" />
 
-        <el-input
-          v-show="isEnable(data.property.is_enable_description)"
+        <RichText
+          v-if="isEnable(data.property.is_enable_description)"
           v-model="data.description"
-          rows="3"
-          resize="none"
-          type="textarea"
-          placeholder="输入描述"
+          placeholder="输入提示"
         />
       </div>
 
@@ -86,6 +83,7 @@
 </template>
 
 <script>
+import RichText from '@/components/common/RichText.vue';
 import QuestionMixin from '../common/QuestionMixin.js';
 
 import { getRandomNumber } from '@/utils';
@@ -93,6 +91,7 @@ import { dialogueData } from '@/views/exercise_questions/data/dialogue';
 
 export default {
   name: 'DialogueQuestion',
+  components: { RichText },
   mixins: [QuestionMixin],
   data() {
     return {
@@ -102,8 +101,9 @@ export default {
   watch: {
     'data.dialogue': {
       handler(val) {
-        if (!val) return;
-
+        if (!val) {
+          return;
+        }
         let direction = 'row';
         let preName = '';
         this.data.option_list = val
@@ -131,7 +131,6 @@ export default {
                   .filter((item) => item)
                   .map((content) => {
                     let isInput = reg.test(content);
-
                     return {
                       content: isInput ? '' : content,
                       mark: getRandomNumber(),
@@ -139,7 +138,6 @@ export default {
                     };
                   });
               }
-
               return {
                 name,
                 content: isFill ? fillList : content,

+ 2 - 3
src/views/exercise_questions/create/components/exercises/EssayQuestion.vue

@@ -4,8 +4,8 @@
       <div class="stem">
         <RichText v-model="data.stem" placeholder="输入题干" />
 
-        <el-input
-          v-show="isEnable(data.property.is_enable_description)"
+        <RichText
+          v-if="isEnable(data.property.is_enable_description)"
           v-model="data.description"
           placeholder="输入提示"
         />
@@ -84,7 +84,6 @@ import { essayQuestionData } from '@/views/exercise_questions/data/essayQuestion
 
 export default {
   name: 'EssayQuestion',
-  components: {},
   mixins: [QuestionMixin],
   data() {
     return {

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

@@ -5,7 +5,7 @@
         <RichText v-model="data.stem" :font-size="18" placeholder="输入题干" />
 
         <el-input
-          v-show="isEnable(data.property.is_enable_description)"
+          v-if="isEnable(data.property.is_enable_description)"
           v-model="data.description"
           rows="3"
           resize="none"

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

@@ -12,7 +12,7 @@
         />
 
         <el-input
-          v-show="isEnable(data.property.is_enable_description)"
+          v-if="isEnable(data.property.is_enable_description)"
           v-model="data.description"
           rows="3"
           resize="none"

+ 5 - 6
src/views/exercise_questions/create/components/exercises/ListenSelectQuestion.vue

@@ -5,13 +5,10 @@
       <div class="stem">
         <RichText v-model="data.stem" :font-size="18" placeholder="输入题干" />
 
-        <el-input
-          v-show="isEnable(data.property.is_enable_description)"
+        <RichText
+          v-if="isEnable(data.property.is_enable_description)"
           v-model="data.description"
-          rows="3"
-          resize="none"
-          type="textarea"
-          placeholder="输入描述"
+          placeholder="输入提示"
         />
 
         <UploadAudio
@@ -119,11 +116,13 @@ import QuestionMixin from '../common/QuestionMixin.js';
 
 import { selectTypeList, scoreTypeList, changeOptionType } from '@/views/exercise_questions/data/common';
 import { getListenSelectData, getOption } from '@/views/exercise_questions/data/listenSelect';
+import RichText from '@/components/common/RichText.vue';
 
 export default {
   name: 'ListenSelectQuestion',
   components: {
     UploadAudio,
+    RichText,
   },
   mixins: [QuestionMixin],
   data() {

+ 8 - 7
src/views/exercise_questions/create/components/exercises/MatchingQuestion.vue

@@ -4,13 +4,10 @@
       <div class="stem">
         <RichText v-model="data.stem" :font-size="18" placeholder="输入题干" />
 
-        <el-input
-          v-show="isEnable(data.property.is_enable_description)"
+        <RichText
+          v-if="isEnable(data.property.is_enable_description)"
           v-model="data.description"
-          rows="3"
-          resize="none"
-          type="textarea"
-          placeholder="输入描述"
+          placeholder="输入提示"
         />
       </div>
 
@@ -100,12 +97,14 @@
 </template>
 
 <script>
+import RichText from '@/components/common/RichText.vue';
 import QuestionMixin from '../common/QuestionMixin.js';
 
 import { columnNumberList, getOption, getMatchingDataTemplate } from '@/views/exercise_questions/data/matching';
 
 export default {
   name: 'MatchingQuestion',
+  components: { RichText },
   mixins: [QuestionMixin],
   data() {
     return {
@@ -116,7 +115,9 @@ export default {
   watch: {
     'data.option_list': {
       handler(val) {
-        if (!val) return;
+        if (!val) {
+          return;
+        }
         this.data.answer.answer_list = val.map((item) => {
           return item.map(({ mark }) => mark);
         });

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

@@ -12,7 +12,7 @@
         />
 
         <RichText
-          v-show="isEnable(data.property.is_enable_description)"
+          v-if="isEnable(data.property.is_enable_description)"
           v-model="data.description"
           placeholder="输入文段"
         />

+ 5 - 6
src/views/exercise_questions/create/components/exercises/ReadQuestion.vue

@@ -4,13 +4,10 @@
       <div class="stem">
         <RichText v-model="data.stem" :font-size="18" :wordlimit-num="5000" placeholder="输入题干" />
 
-        <el-input
-          v-show="isEnable(data.property.is_enable_description)"
+        <RichText
+          v-if="isEnable(data.property.is_enable_description)"
           v-model="data.description"
-          rows="3"
-          resize="none"
-          type="textarea"
-          placeholder="输入描述"
+          placeholder="输入提示"
         />
       </div>
 
@@ -105,11 +102,13 @@ import JudgeQuestion from '@/views/exercise_questions/create/components/exercise
 import MatchingQuestion from '@/views/exercise_questions/create/components/exercises/MatchingQuestion.vue';
 import FillQuestion from '@/views/exercise_questions/create/components/exercises/FillQuestion.vue';
 import ShortAnswerQuestion from './ShortAnswerQuestion.vue';
+import RichText from '@/components/common/RichText.vue';
 
 export default {
   name: 'ReadQuestion',
   components: {
     QuestionHeader,
+    RichText,
   },
   mixins: [QuestionMixin],
   inject: ['exercise_id'],

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

@@ -6,7 +6,7 @@
         <RichText v-model="data.stem" :font-size="18" placeholder="输入题干" />
 
         <RichText
-          v-show="isEnable(data.property.is_enable_description)"
+          v-if="isEnable(data.property.is_enable_description)"
           v-model="data.description"
           placeholder="输入提示"
         />

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

@@ -6,7 +6,7 @@
         <RichText v-model="data.stem" :font-size="18" placeholder="输入题干" />
 
         <RichText
-          v-show="isEnable(data.property.is_enable_description)"
+          v-if="isEnable(data.property.is_enable_description)"
           v-model="data.description"
           placeholder="输入提示"
         />

+ 4 - 7
src/views/exercise_questions/create/components/exercises/SelectQuestion.vue

@@ -5,13 +5,10 @@
       <div class="stem">
         <RichText v-model="data.stem" :font-size="18" placeholder="输入题干" />
 
-        <el-input
-          v-show="isEnable(data.property.is_enable_description)"
+        <RichText
+          v-if="isEnable(data.property.is_enable_description)"
           v-model="data.description"
-          rows="3"
-          resize="none"
-          type="textarea"
-          placeholder="输入描述"
+          placeholder="输入提示"
         />
       </div>
 
@@ -52,7 +49,7 @@
             {{ label }}
           </el-radio>
         </el-form-item>
-        <el-form-item label="描述">
+        <el-form-item label="提示">
           <el-radio
             v-for="{ value, label } in switchOption"
             :key="value"

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

@@ -5,7 +5,7 @@
         <RichText v-model="data.stem" :font-size="18" placeholder="输入题干" />
 
         <el-input
-          v-show="isEnable(data.property.is_enable_description)"
+          v-if="isEnable(data.property.is_enable_description)"
           v-model="data.description"
           rows="3"
           resize="none"

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

@@ -6,7 +6,7 @@
         <RichText v-model="data.stem" :font-size="18" placeholder="输入题干" />
 
         <RichText
-          v-show="isEnable(data.property.is_enable_description)"
+          v-if="isEnable(data.property.is_enable_description)"
           v-model="data.description"
           placeholder="输入提示"
         />

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

@@ -5,7 +5,7 @@
         <RichText v-model="data.stem" :font-size="18" placeholder="输入题干" />
 
         <RichText
-          v-show="isEnable(data.property.is_enable_description)"
+          v-if="isEnable(data.property.is_enable_description)"
           v-model="data.description"
           placeholder="输入提示"
         />

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

@@ -5,7 +5,7 @@
         <RichText v-model="data.stem" :font-size="18" placeholder="输入题干" />
 
         <RichText
-          v-show="isEnable(data.property.is_enable_description)"
+          v-if="isEnable(data.property.is_enable_description)"
           v-model="data.description"
           placeholder="输入提示"
         />

+ 1 - 1
src/views/exercise_questions/data/fill.js

@@ -33,7 +33,7 @@ export const fillData = {
   property: {
     stem_type: stemTypeList[1].value, // 题干类型
     question_number: '1', // 题号
-    is_enable_description: switchOption[1].value, // 描述
+    is_enable_description: switchOption[0].value, // 描述
     score: 1, // 分值
     score_type: scoreTypeList[0].value, // 分值类型
   },

+ 1 - 1
src/views/exercise_questions/data/listenFill.js

@@ -34,7 +34,7 @@ export const listenFillData = {
     stem_type: stemTypeList[1].value, // 题干类型
     question_number: '1', // 题号
     is_enable_listening: switchOption[0].value, // 是否听力
-    is_enable_description: switchOption[1].value, // 描述
+    is_enable_description: switchOption[0].value, // 描述
     score: 1, // 分值
     score_type: scoreTypeList[0].value, // 分值类型
   },

+ 1 - 1
src/views/exercise_questions/data/listenSelect.js

@@ -32,7 +32,7 @@ export function getListenSelectData() {
     property: {
       stem_type: stemTypeList[1].value, // 题干类型
       question_number: '1', // 题号
-      is_enable_description: switchOption[1].value, // 描述
+      is_enable_description: switchOption[0].value, // 描述
       select_type: selectTypeList[0].value, // 选择类型
       is_enable_listening: switchOption[0].value, // 是否听力
       score: 1, // 分值

+ 1 - 1
src/views/exercise_questions/data/matching.js

@@ -34,7 +34,7 @@ export function getMatchingDataTemplate() {
       stem_type: stemTypeList[1].value, // 题干类型
       question_number: '1', // 题号
       column_number: columnNumberList[0].value, // 列数
-      is_enable_description: switchOption[1].value, // 描述
+      is_enable_description: switchOption[0].value, // 描述
       score: 1, // 分值
       score_type: scoreTypeList[0].value, // 分值类型
     },

+ 1 - 1
src/views/exercise_questions/data/read.js

@@ -26,7 +26,7 @@ export const readData = {
   property: {
     stem_type: stemTypeList[1].value, // 题干类型
     question_number: '1', // 题号
-    is_enable_description: switchOption[1].value, // 描述
+    is_enable_description: switchOption[0].value, // 描述
     score: 1, // 分值
     score_type: scoreTypeList[0].value, // 分值类型
   },

+ 1 - 1
src/views/exercise_questions/data/select.js

@@ -32,7 +32,7 @@ export function getSelectData() {
     property: {
       stem_type: stemTypeList[1].value, // 题干类型
       question_number: '1', // 题号
-      is_enable_description: switchOption[1].value, // 描述
+      is_enable_description: switchOption[0].value, // 描述
       select_type: selectTypeList[0].value, // 选择类型
       score: 1, // 分值
       score_type: scoreTypeList[0].value, // 分值类型

+ 5 - 1
src/views/exercise_questions/preview/DialoguePreview.vue

@@ -5,7 +5,11 @@
       <span class="question-number">{{ data.property.question_number }}.</span>
       <span v-html="sanitizeHTML(data.stem)"></span>
     </div>
-    <div v-if="isEnable(data.property.is_enable_description)" class="description">{{ data.description }}</div>
+    <div
+      v-if="isEnable(data.property.is_enable_description)"
+      class="description"
+      v-html="sanitizeHTML(data.description)"
+    ></div>
     <div class="dialogue-wrapper">
       <ul>
         <li

+ 5 - 1
src/views/exercise_questions/preview/ListenSelectPreview.vue

@@ -5,7 +5,11 @@
       <span class="question-number">{{ data.property.question_number }}.</span>
       <span v-html="sanitizeHTML(data.stem)"></span>
     </div>
-    <div v-if="isEnable(data.property.is_enable_description)" class="description">{{ data.description }}</div>
+    <div
+      v-if="isEnable(data.property.is_enable_description)"
+      class="description"
+      v-html="sanitizeHTML(data.description)"
+    ></div>
     <AudioPlay
       v-if="isEnable(data.property.is_enable_listening) && data.file_id_list.length > 0"
       :file-id="data.file_id_list[0]"

+ 5 - 1
src/views/exercise_questions/preview/MatchingPreview.vue

@@ -5,7 +5,11 @@
       <span class="question-number">{{ data.property.question_number }}.</span>
       <span v-html="sanitizeHTML(data.stem)"></span>
     </div>
-    <div v-if="isEnable(data.property.is_enable_description)" class="description">{{ data.description }}</div>
+    <div
+      v-if="isEnable(data.property.is_enable_description)"
+      class="description"
+      v-html="sanitizeHTML(data.description)"
+    ></div>
 
     <ul ref="list" class="option-list">
       <li v-for="(item, i) in optionList" :key="i" class="list-item">

+ 5 - 1
src/views/exercise_questions/preview/ReadPreview.vue

@@ -5,7 +5,11 @@
       <span class="question-number">{{ data.property.question_number }}.</span>
       <span v-html="sanitizeHTML(data.stem)"></span>
     </div>
-    <div v-if="isEnable(data.property.is_enable_description)" class="description">{{ data.description }}</div>
+    <div
+      v-if="isEnable(data.property.is_enable_description)"
+      class="description"
+      v-html="sanitizeHTML(data.description)"
+    ></div>
 
     <div class="container">
       <div class="articel" v-html="sanitizeHTML(data.article)"></div>

+ 5 - 1
src/views/exercise_questions/preview/SelectPreview.vue

@@ -5,7 +5,11 @@
       <span class="question-number">{{ data.property.question_number }}.</span>
       <span v-html="sanitizeHTML(data.stem)"></span>
     </div>
-    <div v-if="isEnable(data.property.is_enable_description)" class="description">{{ data.description }}</div>
+    <div
+      v-if="isEnable(data.property.is_enable_description)"
+      class="description"
+      v-html="sanitizeHTML(data.description)"
+    ></div>
 
     <ul class="option-list">
       <li