natasha 1 год назад
Родитель
Сommit
4abacab099

+ 1 - 1
src/views/bookShelf/components/PracticeModel.vue

@@ -648,7 +648,7 @@ export default {
         let MethodName = "/PaperServer/Client/UserSentRec/RecListInUserSent";
         let data = {
             sent_id: this.articleInfo.art_corpus_data.sentList[index].id,
-            got_rec_data_flag: true
+            got_rec_data_flag: false
         }
         getLogin(MethodName, data)
         .then((res) => {

+ 25 - 70
src/views/bookShelf/components/Voicefullscreen.vue

@@ -153,6 +153,9 @@
                                 : '',
                             pItem.tokens[9]===''?'marginRight':'',pItem.marginRight?'marginSingleRight':'',
                             bgIndex == 1 ? 'word-green' : '',
+                            bgIndex == 1 && wordIndex == pItem.wIndex
+                              ? 'wordActive-blue'
+                              : bgIndex == 0 && wordIndex == pItem.wIndex?'wordActive':'',
                         ]"
                         :style="{fontSize:hzSize + 'px'}"
                         >{{ pItem.tokens[2] }}</span
@@ -173,6 +176,9 @@
                                 : '',
                             item[pIndex + 1].tokens[8]===''?'marginLeft':'',item[pIndex + 1].marginRight?'marginSingleRight':'',
                             bgIndex == 1 ? 'word-green' : '',
+                            bgIndex == 1 && wordIndex == pItem.wIndex
+                              ? 'wordActive-blue'
+                              : '',
                         ]"
                         :style="{fontSize:hzSize + 'px'}"
                     >{{ item[pIndex + 1].tokens[2] }}</span
@@ -198,8 +204,8 @@
           :class="[
             'bottom-left',
           ]"
-        >Soundrecorddiff
-          <!-- <Soundrecorddiff
+        >
+          <Soundrecorddiff
             ref="Soundrecorddiff"
             @handleWav="handleWav"
             @getWavblob="getWavblob"
@@ -209,23 +215,20 @@
             @getMicrophoneStatus="getMicrophoneStatus"
             @getPlayStatus="getPlayStatus"
             :bgIndex="bgIndex"
-            :TaskModel="TaskModel"
             :answerRecordList="
-              curQue.Bookanswer.practiceModel[curSentIndex] &&
-              curQue.Bookanswer.practiceModel[curSentIndex].recordList
+              historySentRecordList
             "
             :tmIndex="curSentIndex"
             :key="'Soundrecorddiff' + curSentIndex"
-          /> -->
+          />
           <div
             :class="['compare-box', bgIndex == 1 ? 'compare-box-white' : '']"
             v-if="isShowCompare"
           >
-          Audio-compare
-            <!-- <Audio-compare
+            <Audio-compare
               :bgIndex="bgIndex"
               type="full"
-              :themeColor="themeColor"
+              :themeColor="''"
               :index="curSentIndex"
               :sentIndex="curSentIndex"
               :url="curQue.mp3_list[0].id"
@@ -238,7 +241,7 @@
               :handleChangeStopAudio="handleChangeStopAudio"
               :getPlayStatus="getPlayStatus"
               :key="'mp3Compare' + curSentIndex"
-            /> -->
+            />
           </div>
         </div>
         <div
@@ -289,15 +292,15 @@
 
 <script>
 import AudioLineSentence from "../../../components/common/AudioLineSentence.vue";
-// import Soundrecorddiff from "./Soundrecorddiff.vue";
-// import AudioCompare from "./AudioCompare.vue";
+import Soundrecorddiff from "../../../components/common/Soundrecorddiff.vue";
+import AudioCompare from "../../../components/common/AudioCompare.vue";
 // import Wordcard from "./components/Wordcard.vue";
 import { getLogin } from "@/api/ajax";
 export default {
   components: {
     AudioLineSentence,
-    // Soundrecorddiff,
-    // AudioCompare,
+    Soundrecorddiff,
+    AudioCompare,
     // Wordcard,
   },
   props: [
@@ -640,7 +643,7 @@ export default {
         let MethodName = "/PaperServer/Client/UserSentRec/RecListInUserSent";
         let data = {
             sent_id: this.curQue.art_corpus_data.sentList[this.curSentIndex].id,
-            got_rec_data_flag: true
+            got_rec_data_flag: false
         }
         getLogin(MethodName, data)
         .then((res) => {
@@ -702,8 +705,8 @@ export default {
       _this.wordIndex = item.wIndex;
       setTimeout(() => {
         let leg = _this.resArr.timeList[_this.curSentIndex].tokens.length;
-        _this.wordbg = _this.resArr.timeList[_this.curSentIndex].s;
-        _this.worded = _this.resArr.timeList[_this.curSentIndex].e;
+        _this.wordbg = _this.resArr.timeList[_this.curSentIndex].tokens[index].s;
+        _this.worded = _this.resArr.timeList[_this.curSentIndex].tokens[index].e;
         let wordMaxTime = (_this.worded - _this.wordbg) / 1000;
         if (wordMaxTime < 1) {
           _this.wordMaxTime = 1;
@@ -957,7 +960,7 @@ export default {
     .voicefull-top-hidden {
       width: 100%;
       height: 310px;
-    //   visibility: hidden;
+      visibility: hidden;
       margin-top: -155px;
       top: 50%;
       position: absolute;
@@ -1161,29 +1164,6 @@ export default {
         float: left;
         > span {
           display: block;
-          &.NNPE-pinyin {
-            font-family: "GB-PINYINOK-B";
-            font-weight: normal;
-            font-size: 32px;
-            line-height: 1.25;
-            box-sizing: border-box;
-            color: rgba(0, 0, 0, 0.85);
-            &.bottom {
-              padding-bottom: 16px;
-            }
-            &.noFont {
-              font-family: initial;
-            }
-            &.textLeft {
-              text-align: left;
-            }
-            &.font-white {
-              color: #fff;
-            }
-            &.wordBlank {
-              color: rgba(0, 0, 0, 0.85);
-            }
-          }
           &.NNPE-chs {
             font-family: "FZJCGFKTK";
             font-size: 48px;
@@ -1202,12 +1182,7 @@ export default {
               }
             }
 
-            .wordActive {
-              color: #de4444;
-            }
-            .wordActive-blue {
-              color: #ffc600;
-            }
+
           }
           // &.padding {
           //   padding-right: 6px;
@@ -1225,29 +1200,6 @@ export default {
       }
       > span {
         display: block;
-        &.NNPE-pinyin {
-          font-family: "GB-PINYINOK-B";
-          font-weight: normal;
-          font-size: 32px;
-          line-height: 1.25;
-          box-sizing: border-box;
-          color: rgba(0, 0, 0, 0.85);
-          &.bottom {
-            padding-bottom: 16px;
-          }
-          &.font-white {
-            color: #fff;
-          }
-          &.noFont {
-            font-family: initial;
-          }
-          &.textLeft {
-            text-align: left;
-          }
-          &.wordBlank {
-            color: rgba(0, 0, 0, 0.85);
-          }
-        }
         &.NNPE-chs {
           font-family: "FZJCGFKTK";
           font-size: 48px;
@@ -1331,6 +1283,9 @@ export default {
                         color: #FFCB47;
                     }
                 }
+                &.wordActive-blue {
+                    color: #ffc600;
+                }
             }
             &.padding {
                 padding: 0 3px;