全屏模式 按钮位置

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

@@ -630,6 +630,7 @@
         :mp3="curQue.mp3_list && curQue.mp3_list[0] ? curQue.mp3_list[0].url : ''"
         :no-font="noFont"
         :NNPENewWordList="NNPENewWordList"
+        :NNPEAnnotationList="NNPEAnnotationList"
         :current-tree-i-d="currentTreeID"
         :config="config"
         :TaskModel="TaskModel"
@@ -662,6 +663,7 @@ export default {
     'noFont',
     'themeColor',
     'NNPENewWordList',
+    'NNPEAnnotationList',
     'currentTreeID',
     'config',
     'TaskModel',

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

@@ -1,126 +1,16 @@
 <!--  -->
 <template>
   <div v-if="sentList" :class="['voicefull', bgIndex == 0 ? 'bg1' : 'bg2']">
-    <div class="voicefull-top" @mouseover="setTopShow(true)" @mouseleave="setTopShow(false)">
-      <div :class="[isTopShow ? 'voicefull-top-show' : 'voicefull-top-hidden']">
-        <div class="top-left">
-          <div :class="['select-bg', bgIndex == 1 ? 'select-bg-blue' : '']">
-            <div :class="['bg-green-box', bgIndex == 1 ? 'active' : '']">
-              <span :class="['bg-green', bgIndex == 1 ? 'active' : '']" @click="changeBg(1)"></span>
-            </div>
-            <div :class="['bg-white-box', bgIndex == 0 ? 'active' : '']">
-              <span :class="['bg-white', bgIndex == 0 ? 'active' : '']" @click="changeBg(0)"></span>
-            </div>
-          </div>
-          <div :class="['set-fontSize', bgIndex == 1 ? 'set-fontSize-green' : '']">
-            <template v-if="hzSize >= 34">
-              <span
-                :class="['font-jian-black', bgIndex == 1 ? 'font-jian-yellow' : '']"
-                @click="setFontSize('-')"
-              ></span>
-            </template>
-            <template v-else>
-              <span
-                :class="['font-jian-black', bgIndex == 1 ? 'font-jian-yellow-disabled' : 'font-jian-white-disabled']"
-              ></span>
-            </template>
-            <span :class="['font-img-black', bgIndex == 1 ? 'font-img-yellow' : '']"></span>
-            <template v-if="hzSize <= 76">
-              <span :class="['font-jia-black', bgIndex == 1 ? 'font-jia-yellow' : '']" @click="setFontSize('+')"></span>
-            </template>
-            <template v-else>
-              <span
-                :class="['font-jia-black', bgIndex == 1 ? 'font-jia-yellow-disabled' : 'font-jia-white-disabled']"
-              ></span>
-            </template>
-          </div>
-          <div
-            :class="['op-btn', bgIndex == 1 ? 'op-btn-green' : '']"
-            title="键盘控制开启后，可用方向键控制翻页，空格键播放暂停，回车键录音"
-            @click="changeStatus('isKeyboard')"
-          >
-            <span
-              :class="[
-                'keyboard-icon',
-                !isKeyboard ? 'disabled' : '',
-                isKeyboard && bgIndex == 1 ? 'keyboard-icon-yellow' : '',
-              ]"
-            ></span>
-          </div>
-        </div>
-        <div class="top-middle">
-          <template v-if="mp3">
-            <AudioLineSentence
-              :key="'sent' + curSentIndex"
-              ref="audioLineSent"
-              :mp3="mp3"
-              :get-cur-time="getCurTime"
-              :audio-id="'artPraAudioId' + curSentIndex"
-              :stop-audio="stopAudio"
-              :width="120"
-              :hide-slider="true"
-              :bg="bg"
-              :ed="ed"
-              :cur-time="curTime"
-              :max-time="maxTime"
-              :bg-index="bgIndex"
-              :is-repeat="isRepeat"
-              :is-auto="isAuto"
-              @playChange="playChange"
-              @rollSentence="rollSentence"
-            />
-          </template>
-          <div :class="['op-btn', bgIndex == 1 ? 'op-btn-green' : '']" @click="setStatus">
-            <span
-              :class="[
-                'repeat-icon',
-                !isRepeat && !isAuto ? 'disabled' : '',
-                !isRepeat && isAuto ? 'auto-icon' : '',
-                isRepeat && bgIndex == 1 ? 'repeat-icon-yellow' : '',
-                !isRepeat && isAuto && bgIndex == 1 ? 'auto-icon-yellow' : '',
-              ]"
-            ></span>
-          </div>
-          <div :class="['op-btn', bgIndex == 1 ? 'op-btn-green' : '']" @click="changePinyin">
-            <span
-              :class="[
-                'pinyin-icon',
-                !config.isShowPY ? 'disabled' : '',
-                config.isShowPY && bgIndex == 1 ? 'pinyin-icon-yellow' : '',
-              ]"
-            ></span>
-          </div>
-          <div :class="['op-btn', bgIndex == 1 ? 'op-btn-green' : '']" @click="changeEN">
-            <span
-              :class="[
-                'en-icon',
-                !enwords ? 'disabled' : '',
-                !config.isShowEN ? 'disabled' : '',
-                config.isShowEN && bgIndex == 1 ? 'en-icon-yellow' : '',
-              ]"
-            ></span>
-          </div>
-          <!-- <div
-            :class="['op-btn', bgIndex == 1 ? 'op-btn-green' : '']"
-            title="点击收藏后可在“个人中心”-“我的收藏”查看"
-            @click="handleColl"
-          >
-            <span
-              :class="[
-                'coll-icon',
-                !isCollArr[curSentIndex] ? 'disabled' : '',
-                isCollArr[curSentIndex] && bgIndex == 1 ? 'coll-icon-yellow' : '',
-              ]"
-            ></span>
-          </div> -->
-        </div>
-        <div :class="['op-btn', bgIndex == 1 ? 'op-btn-green' : '']" @click="exitFullScreen">
-          <span :class="['close-icon', bgIndex == 1 ? 'close-icon-white' : '']"></span>
+    <div class="voicefull-bottom" @mouseover="setTopShow(true)" @mouseleave="setTopShow(false)">
+      <div :class="[isTopShow ? 'voicefull-bottom-show' : 'voicefull-bottom-hidden']">
+        <div :class="['bottom-left', TaskModel == 'ANSWER' ? 'bottom-left-margin' : '']"></div>
+        <div :class="['page-count', bgIndex == 0 ? 'page-count-white' : 'page-count-green']">
+          {{ curSentIndex + 1 }}/{{ sentList.length }}
         </div>
       </div>
     </div>
     <div v-if="item" class="voicefull-content">
-      <div class="vc-box" @mousemove="showPrevNext(true, 'isShowLeft')" @mouseleave="showPrevNext(false, 'isShowLeft')">
+      <div class="vc-box">
         <div
           :class="[
             'vc-left vc-left-grey',
@@ -152,7 +42,7 @@
             @dblclick="showWordDetail($event, pItem)"
             @click="playWord(pItem)"
           >
-            <template v-if="NumberList.indexOf(pItem.chs) == -1">
+            <template>
               <template v-if="!pItem.width">
                 <template v-if="pItem.isShow">
                   <template
@@ -172,7 +62,7 @@
                             fontSize: pySize + 'px',
                             height: pySize * 1.25 + 'px',
                           }"
-                          >{{ pItem.pinyin }}</span
+                          >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.pinyin : '' }}</span
                         >
                       </template>
                       <span
@@ -230,7 +120,7 @@
                             fontSize: pySize + 'px',
                             height: pySize * 1.25 + 'px',
                           }"
-                          >{{ pItem.pinyin }}</span
+                          >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.pinyin : '' }}</span
                         >
                       </template>
                     </span>
@@ -248,7 +138,7 @@
                             textAlign: left,
                             height: pySize * 1.25 + 'px',
                           }"
-                          >{{ item[pIndex + 1].pinyin }}</span
+                          >{{ NumberList.indexOf(item[pIndex + 1].pinyin) == -1 ? item[pIndex + 1].pinyin : '' }}</span
                         >
                       </template>
                       <span
@@ -301,7 +191,7 @@
                             textAlign: left,
                             height: pySize * 1.25 + 'px',
                           }"
-                          >{{ item[pIndex + 1].pinyin }}</span
+                          >{{ NumberList.indexOf(item[pIndex + 1].pinyin) == -1 ? item[pIndex + 1].pinyin : '' }}</span
                         >
                       </template>
                     </span>
@@ -322,7 +212,7 @@
                             textAlign: left,
                             height: pySize * 1.25 + 'px',
                           }"
-                          >{{ item[pIndex + 2].pinyin }}</span
+                          >{{ NumberList.indexOf(item[pIndex + 2].pinyin) == -1 ? item[pIndex + 2].pinyin : '' }}</span
                         >
                       </template>
                       <span
@@ -375,30 +265,28 @@
                             textAlign: left,
                             height: pySize * 1.25 + 'px',
                           }"
-                          >{{ item[pIndex + 2].pinyin }}</span
+                          >{{ NumberList.indexOf(item[pIndex + 2].pinyin) == -1 ? item[pIndex + 2].pinyin : '' }}</span
                         >
                       </template>
                     </span>
                   </template>
                   <template v-else>
                     <template v-if="curQue.property.pinyin_position == 'top'">
-                      <template v-if="NumberList.indexOf(pItem.pinyin) < 0">
-                        <span
-                          v-if="config.isShowPY"
-                          class="NNPE-pinyin"
-                          :class="[
-                            pItem.chs != '“' && pItem.padding ? 'padding' : '',
-                            pItem.className ? pItem.className : '',
-                            noFont.indexOf(pItem.pinyin) > -1 ? 'noFont' : '',
-                            bgIndex == 1 ? 'font-white' : '',
-                          ]"
-                          :style="{
-                            fontSize: pySize + 'px',
-                            height: pySize * 1.25 + 'px',
-                          }"
-                          >{{ pItem.pinyin }}</span
-                        >
-                      </template>
+                      <span
+                        v-if="config.isShowPY"
+                        class="NNPE-pinyin"
+                        :class="[
+                          pItem.chs != '“' && pItem.padding ? 'padding' : '',
+                          pItem.className ? pItem.className : '',
+                          noFont.indexOf(pItem.pinyin) > -1 ? 'noFont' : '',
+                          bgIndex == 1 ? 'font-white' : '',
+                        ]"
+                        :style="{
+                          fontSize: pySize + 'px',
+                          height: pySize * 1.25 + 'px',
+                        }"
+                        >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.pinyin : '' }}</span
+                      >
                     </template>
                     <span
                       v-if="pItem.chs != '#'"
@@ -444,22 +332,20 @@
                       </template>
                     </span>
                     <template v-if="curQue.property.pinyin_position == 'bottom'">
-                      <template v-if="NumberList.indexOf(pItem.pinyin) < 0">
-                        <span
-                          v-if="config.isShowPY"
-                          class="NNPE-pinyin bottom"
-                          :class="[
-                            pItem.chs != '“' && pItem.padding ? 'padding' : '',
-                            pItem.className ? pItem.className : '',
-                            bgIndex == 1 ? 'font-white' : '',
-                          ]"
-                          :style="{
-                            fontSize: pySize + 'px',
-                            height: pySize * 1.25 + 'px',
-                          }"
-                          >{{ pItem.pinyin }}</span
-                        >
-                      </template>
+                      <span
+                        v-if="config.isShowPY"
+                        class="NNPE-pinyin bottom"
+                        :class="[
+                          pItem.chs != '“' && pItem.padding ? 'padding' : '',
+                          pItem.className ? pItem.className : '',
+                          bgIndex == 1 ? 'font-white' : '',
+                        ]"
+                        :style="{
+                          fontSize: pySize + 'px',
+                          height: pySize * 1.25 + 'px',
+                        }"
+                        >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.pinyin : '' }}</span
+                      >
                     </template>
                   </template>
                 </template>
@@ -487,11 +373,7 @@
           {{ enwords }}
         </div>
       </div>
-      <div
-        class="vc-box-right"
-        @mousemove="showPrevNext(true, 'isShowRight')"
-        @mouseleave="showPrevNext(false, 'isShowRight')"
-      >
+      <div class="vc-box-right">
         <div
           :class="[
             'vc-left vc-right-grey',
@@ -503,48 +385,121 @@
         ></div>
       </div>
     </div>
-    <div class="voicefull-bottom" @mouseover="setBottomShow(true)" @mouseleave="setBottomShow(false)">
-      <div :class="[isBottomShow ? 'voicefull-bottom-show' : 'voicefull-bottom-hidden']">
-        <div :class="['bottom-left', TaskModel == 'ANSWER' ? 'bottom-left-margin' : '']">
-          <Soundrecorddiff
-            ref="Soundrecorddiff"
-            :bg-index="bgIndex"
-            :TaskModel="TaskModel"
-            :answer-record-list="
-              curQue.Bookanswer.practiceModel[curSentIndex] && curQue.Bookanswer.practiceModel[curSentIndex].recordList
-            "
-            :tm-index="curSentIndex"
-            @handleWav="handleWav"
-            :key="'Soundrecorddiff' + curSentIndex"
-            @getWavblob="getWavblob"
-            @handleParentPlay="handleParentPlay"
-            @sentPause="sentPause"
-            @getRerordStatus="getRerordStatus"
-            @getMicrophoneStatus="getMicrophoneStatus"
-            @getPlayStatus="getPlayStatus"
-          />
-          <div v-if="isShowCompare" :class="['compare-box', bgIndex == 1 ? 'compare-box-white' : '']">
-            <Audio-compare
-              :bg-index="bgIndex"
-              type="full"
-              :theme-color="themeColor"
-              :index="curSentIndex"
-              :sent-index="curSentIndex"
-              :key="'mp3Compare' + curSentIndex"
-              :url="curQue.mp3_list[0].id"
+    <div class="voicefull-top" @mouseover="setBottomShow(true)" @mouseleave="setBottomShow(false)">
+      <div :class="[isBottomShow ? 'voicefull-top-show' : 'voicefull-top-hidden']">
+        <div class="top-left">
+          <div :class="['select-bg', bgIndex == 1 ? 'select-bg-blue' : '']">
+            <div :class="['bg-green-box', bgIndex == 1 ? 'active' : '']">
+              <span :class="['bg-green', bgIndex == 1 ? 'active' : '']" @click="changeBg(1)"></span>
+            </div>
+            <div :class="['bg-white-box', bgIndex == 0 ? 'active' : '']">
+              <span :class="['bg-white', bgIndex == 0 ? 'active' : '']" @click="changeBg(0)"></span>
+            </div>
+          </div>
+          <div :class="['set-fontSize', bgIndex == 1 ? 'set-fontSize-green' : '']">
+            <template v-if="hzSize >= 34">
+              <span
+                :class="['font-jian-black', bgIndex == 1 ? 'font-jian-yellow' : '']"
+                @click="setFontSize('-')"
+              ></span>
+            </template>
+            <template v-else>
+              <span
+                :class="['font-jian-black', bgIndex == 1 ? 'font-jian-yellow-disabled' : 'font-jian-white-disabled']"
+              ></span>
+            </template>
+            <span :class="['font-img-black', bgIndex == 1 ? 'font-img-yellow' : '']"></span>
+            <template v-if="hzSize <= 76">
+              <span :class="['font-jia-black', bgIndex == 1 ? 'font-jia-yellow' : '']" @click="setFontSize('+')"></span>
+            </template>
+            <template v-else>
+              <span
+                :class="['font-jia-black', bgIndex == 1 ? 'font-jia-yellow-disabled' : 'font-jia-white-disabled']"
+              ></span>
+            </template>
+          </div>
+          <div
+            :class="['op-btn', bgIndex == 1 ? 'op-btn-green' : '']"
+            title="键盘控制开启后，可用方向键控制翻页，空格键播放暂停，回车键录音"
+            @click="changeStatus('isKeyboard')"
+          >
+            <span
+              :class="[
+                'keyboard-icon',
+                !isKeyboard ? 'disabled' : '',
+                isKeyboard && bgIndex == 1 ? 'keyboard-icon-yellow' : '',
+              ]"
+            ></span>
+          </div>
+        </div>
+        <div class="top-middle">
+          <template v-if="mp3">
+            <AudioLineSentence
+              :key="'sent' + curSentIndex"
+              ref="audioLineSent"
+              :mp3="mp3"
+              :get-cur-time="getCurTime"
+              :audio-id="'artPraAudioId' + curSentIndex"
+              :stop-audio="stopAudio"
+              :width="120"
+              :hide-slider="true"
               :bg="bg"
               :ed="ed"
-              :wavblob="wavblob"
-              :get-cur-time="getCurCompareTime"
-              :sent-pause="sentPause"
-              :is-record="isRecord"
-              :handle-change-stop-audio="handleChangeStopAudio"
-              :get-play-status="getPlayStatus"
+              :cur-time="curTime"
+              :max-time="maxTime"
+              :bg-index="bgIndex"
+              :is-repeat="isRepeat"
+              :is-auto="isAuto"
+              @playChange="playChange"
+              @rollSentence="rollSentence"
             />
+          </template>
+          <div :class="['op-btn', bgIndex == 1 ? 'op-btn-green' : '']" @click="setStatus">
+            <span
+              :class="[
+                'repeat-icon',
+                !isRepeat && !isAuto ? 'disabled' : '',
+                !isRepeat && isAuto ? 'auto-icon' : '',
+                isRepeat && bgIndex == 1 ? 'repeat-icon-yellow' : '',
+                !isRepeat && isAuto && bgIndex == 1 ? 'auto-icon-yellow' : '',
+              ]"
+            ></span>
           </div>
+          <div :class="['op-btn', bgIndex == 1 ? 'op-btn-green' : '']" @click="changePinyin">
+            <span
+              :class="[
+                'pinyin-icon',
+                !config.isShowPY ? 'disabled' : '',
+                config.isShowPY && bgIndex == 1 ? 'pinyin-icon-yellow' : '',
+              ]"
+            ></span>
+          </div>
+          <div :class="['op-btn', bgIndex == 1 ? 'op-btn-green' : '']" @click="changeEN">
+            <span
+              :class="[
+                'en-icon',
+                !enwords ? 'disabled' : '',
+                !config.isShowEN ? 'disabled' : '',
+                config.isShowEN && bgIndex == 1 ? 'en-icon-yellow' : '',
+              ]"
+            ></span>
+          </div>
+          <!-- <div
+            :class="['op-btn', bgIndex == 1 ? 'op-btn-green' : '']"
+            title="点击收藏后可在“个人中心”-“我的收藏”查看"
+            @click="handleColl"
+          >
+            <span
+              :class="[
+                'coll-icon',
+                !isCollArr[curSentIndex] ? 'disabled' : '',
+                isCollArr[curSentIndex] && bgIndex == 1 ? 'coll-icon-yellow' : '',
+              ]"
+            ></span>
+          </div> -->
         </div>
-        <div :class="['page-count', bgIndex == 0 ? 'page-count-white' : 'page-count-green']">
-          {{ curSentIndex + 1 }}/{{ sentList.length }}
+        <div :class="['op-btn', bgIndex == 1 ? 'op-btn-green' : '']" @click="exitFullScreen">
+          <span :class="['close-icon', bgIndex == 1 ? 'close-icon-white' : '']"></span>
         </div>
       </div>
     </div>
@@ -559,6 +514,7 @@
           :mp3-url="wordPlayMp3"
           :bg="wordbgs"
           :ed="wordeds"
+          :attrib="attrib"
         />
       </div>
     </template>
@@ -589,7 +545,7 @@ import Soundrecorddiff from './components/Soundrecorddiff.vue';
 import AudioCompare from './components/AudioCompare.vue';
 import Wordcard from './components/Wordcard.vue';
 import { LearnWebSI } from '@/api/app';
-import $ from 'jquery';
+
 export default {
   name: 'VoiceFullScreen',
   components: {
@@ -607,6 +563,7 @@ export default {
     'noFont',
     'themeColor',
     'NNPENewWordList',
+    'NNPEAnnotationList',
     'currentTreeID',
     'config',
     'TaskModel',
@@ -632,8 +589,8 @@ export default {
       stopAudio: false,
       isRecord: false,
       isShowCompare: false,
-      isShowRight: false,
-      isShowLeft: false,
+      isShowRight: true,
+      isShowLeft: true,
       curSentIndex: 0,
       oldHz: '',
       hz: '',
@@ -1065,6 +1022,7 @@ export default {
       _this.pauseAudio();
       _this.isPlaying = false;
       let item = JSON.parse(JSON.stringify(_this.sentList[_this.curSentIndex]));
+      console.log(item);
       if (item.sentArr) {
         _this.item = item.sentArr;
         _this.enwords = item.enwords;
@@ -1172,6 +1130,7 @@ export default {
       if (_this.chsFhList.indexOf(item.chs) > -1 || /^[a-zA-Z0-9]/.test(item.chs)) {
         return;
       }
+
       if (_this.oldHz != item.chs) {
         this.isShow = false;
 
@@ -1220,17 +1179,13 @@ export default {
       let _this = this;
       _this.isShow = true;
       _this.word = null;
-
       if (_this.newWordList.indexOf(val) > -1) {
         for (let i = 0; i < this.NNPENewWordList.length; i++) {
           let pItem = this.NNPENewWordList[i];
-          for (let j = 0; j < pItem.length; j++) {
-            let item = pItem[j];
-            if (item.new_word.trim() == val.trim()) {
-              let wordlist = val.split('');
-              this.word = { list: wordlist, detail: item };
-              break;
-            }
+          if (pItem.new_word.trim() == val.trim()) {
+            let wordlist = val.split('');
+            this.word = { list: wordlist, detail: pItem };
+            break;
           }
         }
       } else {

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

@@ -151,6 +151,7 @@
             :theme-color="bookInfo.theme_color"
             :no-font="noFont"
             :NNPENewWordList="NNPENewWordList"
+            :NNPEAnnotationList="NNPEAnnotationList"
             :current-tree-i-d="courseware_id"
             :config="config"
             :TaskModel="isJudgingRightWrong ? 'ANSWER' : ''"
@@ -190,6 +191,7 @@
             :mp3="data.mp3_list && data.mp3_list[0] ? data.mp3_list[0].url : ''"
             :no-font="noFont"
             :NNPENewWordList="NNPENewWordList"
+            :NNPEAnnotationList="NNPEAnnotationList"
             :current-tree-i-d="courseware_id"
             :is-full="isFull"
             :config="config"

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

@@ -211,7 +211,7 @@
                                       ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
                                       : '22px',
                                 }"
-                                >{{ pItem.pinyin }}</span
+                                >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.pinyin : '' }}</span
                               >
                             </template>
                             <span
@@ -281,7 +281,7 @@
                                       ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
                                       : '22px',
                                 }"
-                                >{{ pItem.pinyin }}</span
+                                >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.pinyin : '' }}</span
                               >
                             </template>
                           </span>
@@ -302,7 +302,11 @@
                                       ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
                                       : '22px',
                                 }"
-                                >{{ item.sentArr[pIndex + 1].pinyin }}</span
+                                >{{
+                                  NumberList.indexOf(item.sentArr[pIndex + 1].pinyin) == -1
+                                    ? item.sentArr[pIndex + 1].pinyin
+                                    : ''
+                                }}</span
                               >
                             </template>
                             <span class="NNPE-chs" style="text-align: left">
@@ -365,7 +369,11 @@
                                       ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
                                       : '22px',
                                 }"
-                                >{{ item.sentArr[pIndex + 1].pinyin }}</span
+                                >{{
+                                  NumberList.indexOf(item.sentArr[pIndex + 1].pinyin) == -1
+                                    ? item.sentArr[pIndex + 1].pinyin
+                                    : ''
+                                }}</span
                               >
                             </template>
                           </span>
@@ -393,7 +401,11 @@
                                       ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
                                       : '22px',
                                 }"
-                                >{{ item.sentArr[pIndex + 2].pinyin }}</span
+                                >{{
+                                  NumberList.indexOf(item.sentArr[pIndex + 2].pinyin) == -1
+                                    ? item.sentArr[pIndex + 2].pinyin
+                                    : ''
+                                }}</span
                               >
                             </template>
                             <span class="NNPE-chs" style="text-align: left">
@@ -456,33 +468,35 @@
                                       ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
                                       : '22px',
                                 }"
-                                >{{ item.sentArr[pIndex + 2].pinyin }}</span
+                                >{{
+                                  NumberList.indexOf(item.sentArr[pIndex + 2].pinyin) == -1
+                                    ? item.sentArr[pIndex + 2].pinyin
+                                    : ''
+                                }}</span
                               >
                             </template>
                           </span>
                         </template>
                         <template v-else>
                           <template v-if="curQue.property.pinyin_position == 'top'">
-                            <template v-if="NumberList.indexOf(pItem.pinyin) < 0">
-                              <span
-                                v-if="config.isShowPY && item.dhaspinyin"
-                                class="NNPE-pinyin"
-                                :class="[
-                                  pItem.chs != '“' && pItem.padding ? 'padding' : '',
-                                  pItem.className ? pItem.className : '',
-                                  sentIndex == index ? 'wordBlank' : '',
-                                  noFont.indexOf(item.pinyin) > -1 ? 'noFont' : '',
-                                ]"
-                                :style="{
-                                  fontSize: attrib && attrib.pinyin_size ? attrib.pinyin_size : '14px',
-                                  height:
-                                    attrib && attrib.pinyin_size
-                                      ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
-                                      : '22px',
-                                }"
-                                >{{ pItem.pinyin }}</span
-                              >
-                            </template>
+                            <span
+                              v-if="config.isShowPY && item.dhaspinyin"
+                              class="NNPE-pinyin"
+                              :class="[
+                                pItem.chs != '“' && pItem.padding ? 'padding' : '',
+                                pItem.className ? pItem.className : '',
+                                sentIndex == index ? 'wordBlank' : '',
+                                noFont.indexOf(item.pinyin) > -1 ? 'noFont' : '',
+                              ]"
+                              :style="{
+                                fontSize: attrib && attrib.pinyin_size ? attrib.pinyin_size : '14px',
+                                height:
+                                  attrib && attrib.pinyin_size
+                                    ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
+                                    : '22px',
+                              }"
+                              >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.pinyin : '' }}</span
+                            >
                           </template>
                           <span
                             v-if="pItem.chs != '#'"
@@ -531,30 +545,28 @@
                                       ? attrib.topic_color
                                       : '',
                                 }"
-                                >{{ pItem.chs[wIndex] }}</span
+                                >{{ NumberList.indexOf(pItem.chs[wIndex]) == -1 ? pItem.chs[wIndex] : '' }}</span
                               >
                             </template>
                           </span>
                           <template v-if="curQue.property.pinyin_position == 'bottom'">
-                            <template v-if="NumberList.indexOf(pItem.pinyin) < 0">
-                              <span
-                                v-if="config.isShowPY && item.dhaspinyin"
-                                class="NNPE-pinyin"
-                                :class="[
-                                  pItem.chs != '“' && pItem.padding ? 'padding' : '',
-                                  pItem.className ? pItem.className : '',
-                                  sentIndex == index ? 'wordBlank' : '',
-                                ]"
-                                :style="{
-                                  fontSize: attrib && attrib.pinyin_size ? attrib.pinyin_size : '14px',
-                                  height:
-                                    attrib && attrib.pinyin_size
-                                      ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
-                                      : '22px',
-                                }"
-                                >{{ pItem.pinyin }}</span
-                              >
-                            </template>
+                            <span
+                              v-if="config.isShowPY && item.dhaspinyin"
+                              class="NNPE-pinyin"
+                              :class="[
+                                pItem.chs != '“' && pItem.padding ? 'padding' : '',
+                                pItem.className ? pItem.className : '',
+                                sentIndex == index ? 'wordBlank' : '',
+                              ]"
+                              :style="{
+                                fontSize: attrib && attrib.pinyin_size ? attrib.pinyin_size : '14px',
+                                height:
+                                  attrib && attrib.pinyin_size
+                                    ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
+                                    : '22px',
+                              }"
+                              >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.pinyin : '' }}</span
+                            >
                           </template>
                         </template>
                       </template>
@@ -738,6 +750,7 @@
         :mp3="curQue.mp3_list && curQue.mp3_list[0] ? curQue.mp3_list[0].id : ''"
         :no-font="noFont"
         :NNPENewWordList="NNPENewWordList"
+        :NNPEAnnotationList="NNPEAnnotationList"
         :current-tree-i-d="currentTreeID"
         :is-full="isFull"
         :config="config"
@@ -801,6 +814,7 @@ export default {
     'attrib',
     'config',
     'NNPENewWordList',
+    'NNPEAnnotationList',
     'currentTreeID',
     'TaskModel',
     'colLength',
@@ -1052,7 +1066,6 @@ export default {
       if (wordTimeList && wordTimeList.length > 0) {
         this.mergeWordTime(sentArrTotal, wordTimeList);
       }
-
       this.resObj = { sentList: resArr };
     },
     // 获取角色
@@ -1083,7 +1096,7 @@ export default {
     },
     // 词和标点合一起
     mergeWordSymbol(wItem) {
-      if (this.chsFhList.indexOf(wItem.chs) > -1 || this.NumberList.indexOf(wItem.pinyin) > -1) {
+      if (this.chsFhList.indexOf(wItem.chs) > -1) {
         wItem.isShow = false;
       } else {
         wItem.isShow = true;

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

@@ -953,7 +953,6 @@ export default {
         } else {
           writeModel[hz] = [answer];
         }
-        console.log(this.curQue.Bookanswer);
       }
     },
   }, // 如果页面有keep-alive缓存功能，这个函数会触发

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

@@ -144,6 +144,7 @@
             :attrib="data.unified_attrib"
             :no-font="noFont"
             :NNPENewWordList="NNPENewWordList"
+            :NNPEAnnotationList="NNPEAnnotationList"
             :config="config"
             :TaskModel="isJudgingRightWrong ? 'ANSWER' : ''"
             :col-length="colLength"
@@ -179,6 +180,7 @@
             :mp3="data.mp3_list && data.mp3_list[0] ? data.mp3_list[0].url : ''"
             :no-font="noFont"
             :NNPENewWordList="NNPENewWordList"
+            :NNPEAnnotationList="NNPEAnnotationList"
             :is-full="isFull"
             :config="config"
             :TaskModel="isJudgingRightWrong ? 'ANSWER' : ''"