guanchunjie 3 years ago
parent
commit
ec256729d2

+ 22 - 14
src/components/Adult/Preview.vue

@@ -72,6 +72,12 @@
                     :colorBox="colorBox"
                   />
                 </template>
+                <template v-if="itemss.type == 'dialogue_answer_chs'">
+                  <DialogueAnswerViewChs
+                    :cur-que="itemss.data"
+                    :colorBox="colorBox"
+                  />
+                </template>
                 <template v-if="itemss.type == 'input_record_chs'">
                   <InputHasRecord :cur-que="itemss.data" />
                 </template>
@@ -179,7 +185,8 @@ import SentenceSort from "./preview/SentenceSort.vue"; // 句子拖拽排序
 import Checkbox from "./preview/CheckBoxModule.vue"; // 问卷调查-多选题
 import VoiceMatrix from "./preview/VoiceMatrix.vue"; // 语音矩阵
 import RecordModule from "./preview/RecordModule.vue"; // 录音组件
-import UploadControlView from "./preview/UploadControlView.vue";//预览控件
+import UploadControlView from "./preview/UploadControlView.vue"; //预览控件
+import DialogueAnswerViewChs from "./preview/DialogueArticleViewChs/DialogueAnswerViewChs.vue"; // 文章模板
 
 export default {
   name: "Preview",
@@ -209,6 +216,7 @@ export default {
     VoiceMatrix,
     RecordModule,
     UploadControlView,
+    DialogueAnswerViewChs,
   },
   props: [
     "context",
@@ -296,7 +304,7 @@ export default {
         // if (list && list.length > 0) {
         //   _this.queList = list;
         //   _this.cur = list[_this.queIndex];
-          _this.queTotal = 1;
+        _this.queTotal = 1;
         //   _this.cur.cur_fn_data.forEach((item) => {
         //     item.table_list.forEach((items) => {
         //       items.forEach((itemss) => {
@@ -315,19 +323,19 @@ export default {
         // }
         _this.cur = _this.contextData;
         _this.cur.cur_fn_data.forEach((item) => {
-            item.table_list.forEach((items) => {
-                items.forEach((itemss) => {
-                if (itemss.data && itemss.data.type == "NewWord_chs") {
-                        _this.NNPENewWordList = _this.NNPENewWordList.concat(
-                        itemss.data.option
-                    );
-                } else if (itemss.data && itemss.data.type == "notes_chs") {
-                        _this.NNPEAnnotationList = _this.NNPEAnnotationList.concat(
-                        itemss.data.option
-                    );
-                }
-                });
+          item.table_list.forEach((items) => {
+            items.forEach((itemss) => {
+              if (itemss.data && itemss.data.type == "NewWord_chs") {
+                _this.NNPENewWordList = _this.NNPENewWordList.concat(
+                  itemss.data.option
+                );
+              } else if (itemss.data && itemss.data.type == "notes_chs") {
+                _this.NNPEAnnotationList = _this.NNPEAnnotationList.concat(
+                  itemss.data.option
+                );
+              }
             });
+          });
         });
       }
     },

+ 1 - 14
src/components/Adult/inputModules/InputRecord.vue

@@ -5,18 +5,6 @@
       src="../../../assets/adult/maikefeng-red.png"
       class="Big-Book-Record-icon"
     /> -->
-<<<<<<< HEAD
-    <div class="adult-book-input-item">
-      <span class="adult-book-lable">标题:</span>           
-      <el-input
-        class="adult-book-input"
-        :autosize="{ minRows: 2 }"
-        type="textarea"
-        placeholder="请输入标题"
-        v-model="curQue.title"
-        @blur="curQue.title = curQue.title.trim()"
-      ></el-input>
-=======
     <div>
       <div class="adult-book-input-item">
         <span class="adult-book-lable">标题:</span>
@@ -29,7 +17,6 @@
           @blur="onBlur(curQue, 'title')"
         ></el-input>
       </div>
->>>>>>> bcc91e147a2ffebc870640078f8aa86a562dc718
     </div>
     <div
       class="Big-Book-hanzi-option"
@@ -70,7 +57,7 @@ export default {
               seg_words: "",
               wordsList: [],
             },
-            font:"",
+            font: "",
             answer: "", //答案
             record: false, //需要录音
             number: "",

+ 4 - 1
src/views/adultInput.vue

@@ -994,7 +994,10 @@ export default {
           this.question_list = res.content
             ? JSON.parse(res.content)
             : JSON.parse(JSON.stringify(this.org_question_list));
-          this.onPreview();
+          if (this.previewVisible) {
+            this.onPreview();
+          }
+
           // this.cur_page_que_index =
           //   this.question_list[this.tabIndex].cur_fn_data.length - 1;
         })