natasha 4 days ago
parent
commit
e1d2c42afe

+ 11 - 11
src/views/book/courseware/data/bookType.js

@@ -45,8 +45,8 @@ import Notes from '../create/components/question/notes/Notes.vue';
 import NotesSetting from '../create/components/question/notes/NotesSetting.vue';
 // import OtherWord from '../create/components/question/other_word/OtherWord.vue';
 // import OtherWordSetting from '../create/components/question/other_word/OtherWordSetting.vue';
-// import Article from '../create/components/question/article/Article.vue';
-// import ArticleSetting from '../create/components/question/article/ArticleSetting.vue';
+import Article from '../create/components/question/article/Article.vue';
+import ArticleSetting from '../create/components/question/article/ArticleSetting.vue';
 // import Math from '../create/components/question/math/Math.vue';
 // import MathSetting from '../create/components/question/math/MathSetting.vue';
 import Input from '../create/components/question/input/Input.vue';
@@ -92,7 +92,7 @@ import WritePreview from '../preview/components/write/WritePreview.vue';
 import NewWordPreview from '../preview/components/new_word/NewWordPreview.vue';
 import NotesPreview from '../preview/components/notes/NotesPreview.vue';
 // import OtherWordPreview from '../preview/components/other_word/OtherWordPreview.vue';
-// import ArticlePreview from '../preview/components/article/index.vue';
+import ArticlePreview from '../preview/components/article/index.vue';
 // import MathPreview from '../preview/components/math/MathPreview.vue';
 import InputPreview from '../preview/components/input/InputPreview.vue';
 
@@ -229,14 +229,14 @@ export const bookTypeOption = [
     value: 'question',
     label: '题型组件',
     children: [
-      // {
-      //   value: 'article',
-      //   label: '文章组件',
-      //   icon: '',
-      //   component: Article,
-      //   set: ArticleSetting,
-      //   preview: ArticlePreview,
-      // },
+      {
+        value: 'article',
+        label: '文章组件',
+        icon: '',
+        component: Article,
+        set: ArticleSetting,
+        preview: ArticlePreview,
+      },
       {
         value: 'select',
         label: '选择组件',

+ 15 - 13
src/views/book/courseware/preview/components/article/NormalModelChs.vue

@@ -994,12 +994,14 @@ export default {
       this.getSentIndex(this.curTime);
     },
     getSentIndex(curTime) {
-      for (let i = 0; i < this.curQue.wordTime.length; i++) {
-        let bg = this.curQue.wordTime[i].bg;
-        let ed = this.curQue.wordTime[i].ed;
-        if (curTime >= bg && curTime <= ed) {
-          this.sentIndex = i;
-          break;
+      if (this.curQue.wordTime) {
+        for (let i = 0; i < this.curQue.wordTime.length; i++) {
+          let bg = this.curQue.wordTime[i].bg;
+          let ed = this.curQue.wordTime[i].ed;
+          if (curTime >= bg && curTime <= ed) {
+            this.sentIndex = i;
+            break;
+          }
         }
       }
     },
@@ -1072,7 +1074,7 @@ export default {
         let startLeg = dIndex == 0 ? 0 : curQue.detail[dIndex - 1].endLeg;
         let endLeg = startLeg + curSentencesLeg;
         dItem.endLeg = endLeg;
-        let timeList = curQue.wordTime.slice(startLeg, endLeg);
+        let timeList = curQue.wordTime ? curQue.wordTime.slice(startLeg, endLeg) : [];
         let paraObj = {
           wordsList: paraArr,
           timeList,
@@ -1092,8 +1094,8 @@ export default {
       }
 
       let resArrs = [];
-        let sentArrTotal = [];
-        let timeArr = [];
+      let sentArrTotal = [];
+      let timeArr = [];
       curQue.detail.forEach((dItem, dIndex) => {
         dItem.wordsList.forEach((sItem, sIndex) => {
           let sentArr = [];
@@ -1233,10 +1235,10 @@ export default {
       if (left - this.bodyLeft > this.contentWidth / 2) {
         _this.left = 500;
       } else if (left - 200 > 500) {
-          _this.left = 500;
-        } else {
-          _this.left = left - 200;
-        }
+        _this.left = 500;
+      } else {
+        _this.left = left - 200;
+      }
       if (_this.oldNoteNum === noteNum) {
         _this.handleNote(noteNum);
       }

+ 5 - 5
src/views/book/courseware/preview/components/article/index.vue

@@ -154,9 +154,9 @@
           />
         </div>
       </div>
-      <template v-if="data.new_word_list.option.length > 0">
-        <!-- <NewWordPreview :newData="data.new_word_list"></NewWordPreview> -->
-      </template>
+      <!--<template v-if="data.new_word_list.option.length > 0">
+        <NewWordPreview :newData="data.new_word_list"></NewWordPreview> 
+      </template>-->
     </div>
   </div>
 </template>
@@ -386,8 +386,8 @@ export default {
           this.data.mp3_list[0].url = url_map[this.data.mp3_list[0].file_id];
         });
       }
-      this.NNPENewWordList = this.data.new_word_list.option.concat(this.data.other_word_list.option);
-      this.NNPEAnnotationList = this.data.notes_list.option;
+      this.NNPENewWordList = this.data.new_word_list_other_component_input;
+      // this.NNPEAnnotationList = this.data.notes_list.option;
       let resArr = [];
       let sentArrTotal = [];
       let timeArr = [];

+ 0 - 1
src/views/book/courseware/preview/components/table/TablePreview.vue

@@ -101,7 +101,6 @@ export default {
   methods: {
     handleData() {
       this.table_width = 0;
-      console.log(2);
       this.data.col_width.forEach((item) => {
         this.table_width += Number(item.value);
       });