|
@@ -74,7 +74,7 @@
|
|
|
@changeConfig="changeConfig"
|
|
|
:NNPEAnnotationList="NNPEAnnotationList"
|
|
|
:colLength="colLength"
|
|
|
- :multilingualTextList="showLang && multilingualTextList[getLang()] ? multilingualTextList[getLang()] : []"
|
|
|
+ :multilingual="showLang && getLang() ? getLang() : ''"
|
|
|
/>
|
|
|
<PhraseModel
|
|
|
:curQue="data"
|
|
@@ -91,7 +91,7 @@
|
|
|
:NNPEAnnotationList="NNPEAnnotationList"
|
|
|
:colLength="colLength"
|
|
|
:NpcNewWordMp3="NpcNewWordMp3"
|
|
|
- :multilingualTextList="showLang && multilingualTextList[getLang()] ? multilingualTextList[getLang()] : []"
|
|
|
+ :multilingual="showLang && getLang() ? getLang() : ''"
|
|
|
/>
|
|
|
<Practice
|
|
|
:curQue="data"
|
|
@@ -107,7 +107,7 @@
|
|
|
:colLength="colLength"
|
|
|
:NpcNewWordMp3="NpcNewWordMp3"
|
|
|
:isFull="isFull"
|
|
|
- :multilingualTextList="showLang && multilingualTextList[getLang()] ? multilingualTextList[getLang()] : []"
|
|
|
+ :multilingual="showLang && getLang() ? getLang() : ''"
|
|
|
/>
|
|
|
<WordModel
|
|
|
:curQue="data"
|
|
@@ -123,7 +123,7 @@
|
|
|
@changeConfig="changeConfig"
|
|
|
:TaskModel="isJudgingRightWrong ? 'ANSWER' : ''"
|
|
|
:colLength="colLength"
|
|
|
- :multilingualTextList="showLang && multilingualTextList[getLang()] ? multilingualTextList[getLang()] : []"
|
|
|
+ :multilingual="showLang && getLang() ? getLang() : ''"
|
|
|
/>
|
|
|
</div>
|
|
|
<div class="voice-full-screen" :id="'screen-' + mathNum">
|
|
@@ -209,7 +209,7 @@ export default {
|
|
|
this.config.isHasEN = true;
|
|
|
}
|
|
|
let pinyin = this.handleObj(this.data.detail[i].wordsList);
|
|
|
- if (pinyin) {
|
|
|
+ if (pinyin && this.data.property.is_enable_pinyin) {
|
|
|
this.config.isShowPY = true;
|
|
|
this.config.isHasPY = true;
|
|
|
}
|
|
@@ -389,7 +389,16 @@ export default {
|
|
|
if (this.showLang) {
|
|
|
this.data.multilingual.forEach((item) => {
|
|
|
let trans_arr = item.translation.split('\n');
|
|
|
- this.$set(this.multilingualTextList, item.type, trans_arr);
|
|
|
+ this.data.detail.forEach((items) => {
|
|
|
+ let items_trans_arr = [];
|
|
|
+ if (!items.hasOwnProperty('multilingualTextList')) {
|
|
|
+ this.$set(items, 'multilingualTextList', {});
|
|
|
+ }
|
|
|
+ if (items.para) {
|
|
|
+ items_trans_arr = trans_arr.splice(0, items.sentences.length);
|
|
|
+ }
|
|
|
+ this.$set(items.multilingualTextList, item.type, items_trans_arr);
|
|
|
+ });
|
|
|
});
|
|
|
}
|
|
|
let userAnswer = JSON.parse(JSON.stringify(this.userAnswer));
|
|
@@ -466,7 +475,9 @@ export default {
|
|
|
resArr.push(objs);
|
|
|
});
|
|
|
timeArr.push(dItem.timeList);
|
|
|
- dhaspinyinArr.push(dhaspinyin);
|
|
|
+ if (curQue.property.is_enable_pinyin) {
|
|
|
+ dhaspinyinArr.push(dhaspinyin);
|
|
|
+ }
|
|
|
});
|
|
|
if (wordTimeList && wordTimeList.length > 0) {
|
|
|
this.mergeWordTime(sentArrTotal, wordTimeList);
|
|
@@ -657,6 +668,11 @@ export default {
|
|
|
.aduioLine-box {
|
|
|
width: 100%;
|
|
|
border-bottom: 1px solid rgba(0, 0, 0, 10%);
|
|
|
+
|
|
|
+ &-bottom {
|
|
|
+ border-top: 1px solid rgba(0, 0, 0, 10%);
|
|
|
+ border-bottom: none;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -723,6 +739,11 @@ export default {
|
|
|
.aduioLine-box {
|
|
|
width: 100%;
|
|
|
border-bottom: 1px solid rgba(0, 0, 0, 10%);
|
|
|
+
|
|
|
+ &-bottom {
|
|
|
+ border-top: 1px solid rgba(0, 0, 0, 10%);
|
|
|
+ border-bottom: none;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
</style>
|