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

src/views/book/courseware/create/components/question/dialogue_article/Article.vue

@@ -670,6 +670,8 @@ export default {
               _this.data.wordTime = res.data.result;
               _this.isWordTime = false;
             });
+          } else {
+            this.$message.warning('请先生成分词');
           }
         } else {
           _this.$message.warning('请先上传音频');

src/views/book/courseware/preview/components/article/NormalModelChs.vue

@@ -942,7 +942,7 @@
           left: windowWidth > 642 ? '' : '0px',
         }"
       >
-        <Notecard :item="curNoteCon" :change-card="changeCard" />
+        <Notecard :item="curNoteCon" :change-card="changeCard" :attrib="attrib" />
       </div>
     </template>
   </div>

src/views/book/courseware/preview/components/article/PhraseModelChs.vue

@@ -666,6 +666,7 @@
           :bg="activeWord ? activeWord.bg : null"
           :ed="activeWord ? activeWord.ed : null"
           @changeCurQue="changeCurQue"
+          :attrib="attrib"
         />
       </div>
     </template>
@@ -678,7 +679,7 @@
           left: windowWidth > 642 ? '' : '0px',
         }"
       >
-        <Notecard :item="curNoteCon" :change-card="changeCard" />
+        <Notecard :item="curNoteCon" :change-card="changeCard" :attrib="attrib" />
       </div>
     </template>
   </div>

src/views/book/courseware/preview/components/article/Practicechs.vue

@@ -512,6 +512,7 @@
         @changeEN="changeEN"
         @exitFullscreen="exitFullscreen"
         @changeIsFull="changeIsFull"
+        :attrib="attrib"
       />
     </div>
   </div>

src/views/book/courseware/preview/components/article/WordModelChs.vue

@@ -635,6 +635,7 @@
           :TaskModel="TaskModel"
           :write-list="curQue.Bookanswer.writeModel"
           @changeCurQue="changeCurQue"
+          :attrib="attrib"
         />
       </div>
     </template>
@@ -644,7 +645,6 @@
 <script>
 import AudioLine from '../voice_matrix/components/AudioLine.vue';
 import Wordcard from './components/Wordcard.vue'; // 卡片
-import $ from 'jquery';
 export default {
   name: 'WordModelChs',
   components: {

src/views/book/courseware/preview/components/article/components/Wordcard.vue

@@ -78,6 +78,7 @@
           <span v-else>暂无释义</span>
         </span> -->
         <div class="bwc-word-en" :class="['bwc-word-en' + word.detail.new_word.length]">
+          <span v-html="word.detail.cixing"></span>
           <span v-if="defChsArr.length > 0" class="word-chs" v-html="defChsArr[0]"></span>
           <span v-if="defEnArr.length > 0" class="word-en" v-html="defEnArr[0]"></span>
         </div>
@@ -608,6 +609,10 @@ export default {
       color: rgba(0, 0, 0, 85%);
       text-overflow: ellipsis;
       white-space: nowrap;
+
+      :deep p {
+        margin: 0;
+      }
     }
 
     .word-chs {

src/views/book/courseware/preview/components/dialogue_article/NormalModelChs.vue

@@ -547,7 +547,7 @@
           left: windowWidth > 642 ? '' : '0px',
         }"
       >
-        <Notecard :item="curNoteCon" :changeCard="changeCard" />
+        <Notecard :item="curNoteCon" :changeCard="changeCard" :attrib="attrib" />
       </div>
     </template>
   </div>

src/views/book/courseware/preview/components/dialogue_article/PhraseModelChs.vue

@@ -413,6 +413,7 @@
           :mp3Url="wordPlayMp3"
           :bg="wordbgs"
           :ed="wordeds"
+          :attrib="attrib"
         />
       </div>
     </template>
@@ -425,7 +426,7 @@
           left: windowWidth > 642 ? '' : '0px',
         }"
       >
-        <Notecard :item="curNoteCon" :changeCard="changeCard" />
+        <Notecard :item="curNoteCon" :changeCard="changeCard" :attrib="attrib" />
       </div>
     </template>
   </div>
@@ -541,7 +542,6 @@ export default {
         let _this = this;
         if (val) {
           setTimeout(() => {
-            console.log(_this.$refs.dialogueWordcard);
             _this.cardHeight = _this.$refs.dialogueWordcard.offsetHeight;
             if (_this.screenHeight - _this.clientY > _this.cardHeight) {
               _this.top = _this.clientY + 20;

src/views/book/courseware/preview/components/dialogue_article/Practicechs.vue

@@ -598,6 +598,7 @@
         @exitFullscreen="exitFullscreen"
         @changeIsFull="changeIsFull"
         :NpcNewWordMp3="NpcNewWordMp3"
+        :attrib="attrib"
       />
     </div>
   </div>

src/views/book/courseware/preview/components/dialogue_article/WordModelChs.vue

@@ -392,6 +392,7 @@
           :TaskModel="TaskModel"
           :writeList="curQue.Bookanswer.writeModel"
           @changeCurQue="changeCurQue"
+          :attrib="attrib"
         />
       </div>
     </template>
@@ -404,7 +405,7 @@
           left: windowWidth > 642 ? '' : '0px',
         }"
       >
-        <Notecard :item="curNoteCon" :changeCard="changeCard" />
+        <Notecard :item="curNoteCon" :changeCard="changeCard" :attrib="attrib" />
       </div>
     </template>
   </div>
@@ -577,7 +578,6 @@ export default {
       this.$set(this.curQue.Bookanswer.wordModel, 'recordList', list);
     },
     getCurTime(curTime) {
-      console.log(curTime);
       this.curTime = curTime * 1000;
     },
     handleData() {

src/views/book/courseware/preview/components/new_word/NewWordPreview.vue

@@ -152,13 +152,23 @@
                         <span
                           v-if="data.property.pinyin_position == 'top'"
                           class="NPC-word-tab-common NPC-word-tab-pinyin"
-                          :style="{ width: data.col_width[0].value + 'px' }"
+                          :style="{
+                            width: data.col_width[0].value + 'px',
+                            fontSize:
+                              data.unified_attrib && data.unified_attrib.pinyin_size
+                                ? data.unified_attrib.pinyin_size
+                                : '',
+                          }"
                           v-html="sItem.pinyin"
                         >
                         </span>
 
                         <span
-                          :style="{ width: data.col_width[0].value + 'px' }"
+                          :style="{
+                            width: data.col_width[0].value + 'px',
+                            fontSize:
+                              data.unified_attrib && data.unified_attrib.font_size ? data.unified_attrib.font_size : '',
+                          }"
                           class="NPC-word-tab-common NPC-word-tab-word"
                           v-html="sItem.new_word"
                         >
@@ -166,7 +176,13 @@
                         <span
                           v-if="data.property.pinyin_position == 'bottom'"
                           class="NPC-word-tab-common NPC-word-tab-pinyin"
-                          :style="{ width: data.col_width[0].value + 'px' }"
+                          :style="{
+                            width: data.col_width[0].value + 'px',
+                            fontSize:
+                              data.unified_attrib && data.unified_attrib.pinyin_size
+                                ? data.unified_attrib.pinyin_size
+                                : '',
+                          }"
                           v-html="sItem.pinyin"
                         >
                         </span>
@@ -220,12 +236,33 @@
                       <span
                         v-if="!data.property.pinyin_position || data.property.pinyin_position == 'front'"
                         class="NPC-word-tab-common NPC-word-tab-pinyin"
-                        :style="{ width: data.col_width[1].value + 'px' }"
+                        :style="{
+                          width: data.col_width[1].value + 'px',
+                          fontSize:
+                            data.unified_attrib && data.unified_attrib.pinyin_size
+                              ? data.unified_attrib.pinyin_size
+                              : '',
+                          lineHeight:
+                            data.unified_attrib && data.unified_attrib.font_size
+                              ? data.unified_attrib.font_size.replace('pt', '') * 1.5 + 'pt'
+                              : '',
+                        }"
                         v-html="sItem.pinyin"
                       >
                       </span>
-                      <span :style="{ width: data.col_width[0].value + 'px' }">
-                        <p class="NPC-word-tab-common NPC-word-tab-word" v-html="sItem.new_word"></p>
+                      <span
+                        :style="{
+                          width: data.col_width[0].value + 'px',
+                        }"
+                      >
+                        <p
+                          class="NPC-word-tab-common NPC-word-tab-word"
+                          v-html="sItem.new_word"
+                          :style="{
+                            fontSize:
+                              data.unified_attrib && data.unified_attrib.font_size ? data.unified_attrib.font_size : '',
+                          }"
+                        ></p>
                         <span
                           class="NPC-word-tab-common"
                           :style="{ width: data.col_width[0].value + 'px' }"
@@ -242,7 +279,17 @@
                       <span
                         v-if="data.property.pinyin_position == 'back'"
                         class="NPC-word-tab-common NPC-word-tab-pinyin"
-                        :style="{ width: data.col_width[1].value + 'px' }"
+                        :style="{
+                          width: data.col_width[1].value + 'px',
+                          fontSize:
+                            data.unified_attrib && data.unified_attrib.pinyin_size
+                              ? data.unified_attrib.pinyin_size
+                              : '',
+                          lineHeight:
+                            data.unified_attrib && data.unified_attrib.font_size
+                              ? data.unified_attrib.font_size.replace('pt', '') * 1.5 + 'pt'
+                              : '',
+                        }"
                         v-html="sItem.pinyin"
                       >
                       </span>
@@ -734,6 +781,9 @@ export default {
       });
       this.rowWidth += 132;
       this.is_change = true;
+      setTimeout(() => {
+        this.is_change = false;
+      }, 2000);
       let resIndex = 0;
       let optionRes = [];
       let itemNumber = 0;

src/views/book/courseware/preview/components/notes/NotesPreview.vue

@@ -39,12 +39,29 @@
                 <div class="NPC-notes-con-box">
                   <template v-if="isEnable(data.property.view_pinyin)">
                     <p class="pinyin-text">
-                      <span v-if="data.property.pinyin_position === 'top'" class="pinyin" v-html="item.pinyin"> </span>
+                      <span
+                        v-if="data.property.pinyin_position === 'top'"
+                        class="pinyin"
+                        v-html="item.pinyin"
+                        :style="{
+                          fontSize:
+                            data.unified_attrib && data.unified_attrib.pinyin_size
+                              ? data.unified_attrib.pinyin_size
+                              : '',
+                        }"
+                      >
+                      </span>
                       <span>
                         <span
                           v-if="data.property.pinyin_position === 'front'"
                           v-html="item.pinyin"
                           class="pinyin pinyin-front"
+                          :style="{
+                            fontSize:
+                              data.unified_attrib && data.unified_attrib.pinyin_size
+                                ? data.unified_attrib.pinyin_size
+                                : '',
+                          }"
                         ></span
                         ><span
                           class="NPC-notes-con-text"
@@ -54,18 +71,32 @@
                               data.unified_attrib && data.unified_attrib.topic_color
                                 ? data.unified_attrib.topic_color
                                 : '',
+                            fontSize:
+                              data.unified_attrib && data.unified_attrib.font_size ? data.unified_attrib.font_size : '',
                           }"
                         ></span
                         ><span
                           v-if="data.property.pinyin_position === 'back'"
                           v-html="item.pinyin"
                           class="pinyin pinyin-back"
+                          :style="{
+                            fontSize:
+                              data.unified_attrib && data.unified_attrib.pinyin_size
+                                ? data.unified_attrib.pinyin_size
+                                : '',
+                          }"
                         ></span>
                       </span>
                       <span
                         v-if="data.property.pinyin_position === 'bottom'"
                         class="pinyin"
                         v-html="item.pinyin"
+                        :style="{
+                          fontSize:
+                            data.unified_attrib && data.unified_attrib.pinyin_size
+                              ? data.unified_attrib.pinyin_size
+                              : '',
+                        }"
                       ></span>
                     </p>
                   </template>
@@ -77,6 +108,8 @@
                     :style="{
                       color:
                         data.unified_attrib && data.unified_attrib.topic_color ? data.unified_attrib.topic_color : '',
+                      fontSize:
+                        data.unified_attrib && data.unified_attrib.font_size ? data.unified_attrib.font_size : '',
                     }"
                   ></span>
                   <span class="multilingual" v-if="showLang">