|
@@ -21,7 +21,13 @@
|
|
|
</div>
|
|
</div>
|
|
|
<template v-if="resArr.length > 0">
|
|
<template v-if="resArr.length > 0">
|
|
|
<div class="NPC-sentences-list">
|
|
<div class="NPC-sentences-list">
|
|
|
- <p class="notice" v-if="curQue.notice">{{ curQue.notice }}</p>
|
|
|
|
|
|
|
+ <p
|
|
|
|
|
+ class="notice"
|
|
|
|
|
+ v-if="curQue.notice"
|
|
|
|
|
+ :style="{ fontSize: baseSizePhone + 'px' }"
|
|
|
|
|
+ >
|
|
|
|
|
+ {{ curQue.notice }}
|
|
|
|
|
+ </p>
|
|
|
<div
|
|
<div
|
|
|
:class="[
|
|
:class="[
|
|
|
'NNPE-detail',
|
|
'NNPE-detail',
|
|
@@ -42,12 +48,16 @@
|
|
|
class="roleDetail"
|
|
class="roleDetail"
|
|
|
v-if="item.roleDetail.detail.wordsList.length > 0"
|
|
v-if="item.roleDetail.detail.wordsList.length > 0"
|
|
|
>
|
|
>
|
|
|
- <span class="pinyin">{{
|
|
|
|
|
- item.roleDetail.detail.wordsList | handlePinyin
|
|
|
|
|
- }}</span>
|
|
|
|
|
- <span class="chs">{{
|
|
|
|
|
- item.roleDetail.detail.wordsList | handleChs
|
|
|
|
|
- }}</span>
|
|
|
|
|
|
|
+ <span
|
|
|
|
|
+ class="pinyin"
|
|
|
|
|
+ :style="{ fontSize: baseSizePhone + 'px' }"
|
|
|
|
|
+ >{{ item.roleDetail.detail.wordsList | handlePinyin }}</span
|
|
|
|
|
+ >
|
|
|
|
|
+ <span
|
|
|
|
|
+ class="chs"
|
|
|
|
|
+ :style="{ fontSize: baseSizePhone + 6 + 'px' }"
|
|
|
|
|
+ >{{ item.roleDetail.detail.wordsList | handleChs }}</span
|
|
|
|
|
+ >
|
|
|
</div>
|
|
</div>
|
|
|
<div
|
|
<div
|
|
|
class="para-con"
|
|
class="para-con"
|
|
@@ -56,6 +66,7 @@
|
|
|
<div
|
|
<div
|
|
|
v-if="item.enwords && enPosition && enPosition == 'top'"
|
|
v-if="item.enwords && enPosition && enPosition == 'top'"
|
|
|
class="enwords"
|
|
class="enwords"
|
|
|
|
|
+ :style="{ fontSize: baseSizePhone + 'px' }"
|
|
|
>
|
|
>
|
|
|
{{ item.enwords }}
|
|
{{ item.enwords }}
|
|
|
</div>
|
|
</div>
|
|
@@ -108,6 +119,7 @@
|
|
|
? 'NNPE-pinyin-underline'
|
|
? 'NNPE-pinyin-underline'
|
|
|
: ''
|
|
: ''
|
|
|
]"
|
|
]"
|
|
|
|
|
+ :style="{ fontSize: baseSizePhone + 'px' }"
|
|
|
>{{ pItem.pinyin | handlePY }}</span
|
|
>{{ pItem.pinyin | handlePY }}</span
|
|
|
>
|
|
>
|
|
|
<template v-if="!pItem.isHeng">
|
|
<template v-if="!pItem.isHeng">
|
|
@@ -214,6 +226,7 @@
|
|
|
? 'NNPE-pinyin-underline'
|
|
? 'NNPE-pinyin-underline'
|
|
|
: ''
|
|
: ''
|
|
|
]"
|
|
]"
|
|
|
|
|
+ :style="{ fontSize: baseSizePhone + 'px' }"
|
|
|
>{{ pItem.pinyin | handlePY }}</span
|
|
>{{ pItem.pinyin | handlePY }}</span
|
|
|
>
|
|
>
|
|
|
</span>
|
|
</span>
|
|
@@ -241,6 +254,7 @@
|
|
|
: ''
|
|
: ''
|
|
|
]"
|
|
]"
|
|
|
style="text-align: left"
|
|
style="text-align: left"
|
|
|
|
|
+ :style="{ fontSize: baseSizePhone + 'px' }"
|
|
|
>{{
|
|
>{{
|
|
|
item.wordsList[pIndex + 1].pinyin | handlePY
|
|
item.wordsList[pIndex + 1].pinyin | handlePY
|
|
|
}}</span
|
|
}}</span
|
|
@@ -279,6 +293,7 @@
|
|
|
: ''
|
|
: ''
|
|
|
]"
|
|
]"
|
|
|
style="text-align: left"
|
|
style="text-align: left"
|
|
|
|
|
+ :style="{ fontSize: baseSizePhone + 'px' }"
|
|
|
>{{
|
|
>{{
|
|
|
item.wordsList[pIndex + 1].pinyin | handlePY
|
|
item.wordsList[pIndex + 1].pinyin | handlePY
|
|
|
}}</span
|
|
}}</span
|
|
@@ -318,6 +333,7 @@
|
|
|
: ''
|
|
: ''
|
|
|
]"
|
|
]"
|
|
|
style="text-align: left"
|
|
style="text-align: left"
|
|
|
|
|
+ :style="{ fontSize: baseSizePhone + 'px' }"
|
|
|
>{{ item.wordsList[pIndex + 2].pinyin }}</span
|
|
>{{ item.wordsList[pIndex + 2].pinyin }}</span
|
|
|
>
|
|
>
|
|
|
<span
|
|
<span
|
|
@@ -362,6 +378,7 @@
|
|
|
: ''
|
|
: ''
|
|
|
]"
|
|
]"
|
|
|
style="text-align: left"
|
|
style="text-align: left"
|
|
|
|
|
+ :style="{ fontSize: baseSizePhone + 'px' }"
|
|
|
>{{ item.wordsList[pIndex + 2].pinyin }}</span
|
|
>{{ item.wordsList[pIndex + 2].pinyin }}</span
|
|
|
>
|
|
>
|
|
|
</span>
|
|
</span>
|
|
@@ -380,6 +397,7 @@
|
|
|
? 'NNPE-pinyin-underline'
|
|
? 'NNPE-pinyin-underline'
|
|
|
: ''
|
|
: ''
|
|
|
]"
|
|
]"
|
|
|
|
|
+ :style="{ fontSize: baseSizePhone + 'px' }"
|
|
|
>{{ pItem.pinyin | handlePY }}</span
|
|
>{{ pItem.pinyin | handlePY }}</span
|
|
|
>
|
|
>
|
|
|
<template v-if="!pItem.isHeng">
|
|
<template v-if="!pItem.isHeng">
|
|
@@ -391,6 +409,7 @@
|
|
|
? 'padding'
|
|
? 'padding'
|
|
|
: ''
|
|
: ''
|
|
|
]"
|
|
]"
|
|
|
|
|
+ :style="{ fontSize: baseSizePhone + 6 + 'px' }"
|
|
|
>
|
|
>
|
|
|
<template>
|
|
<template>
|
|
|
<span
|
|
<span
|
|
@@ -503,6 +522,7 @@
|
|
|
? 'NNPE-pinyin-underline'
|
|
? 'NNPE-pinyin-underline'
|
|
|
: ''
|
|
: ''
|
|
|
]"
|
|
]"
|
|
|
|
|
+ :style="{ fontSize: baseSizePhone + 'px' }"
|
|
|
>{{ pItem.pinyin | handlePY }}</span
|
|
>{{ pItem.pinyin | handlePY }}</span
|
|
|
>
|
|
>
|
|
|
</template>
|
|
</template>
|
|
@@ -523,6 +543,7 @@
|
|
|
item.enwords &&
|
|
item.enwords &&
|
|
|
(!enPosition || (enPosition && enPosition == 'bottom'))
|
|
(!enPosition || (enPosition && enPosition == 'bottom'))
|
|
|
"
|
|
"
|
|
|
|
|
+ :style="{ fontSize: baseSizePhone + 'px' }"
|
|
|
class="enwords"
|
|
class="enwords"
|
|
|
>
|
|
>
|
|
|
{{ item.enwords }}
|
|
{{ item.enwords }}
|
|
@@ -607,12 +628,16 @@
|
|
|
class="roleDetail"
|
|
class="roleDetail"
|
|
|
v-if="item.roleDetail.detail.wordsList.length > 0"
|
|
v-if="item.roleDetail.detail.wordsList.length > 0"
|
|
|
>
|
|
>
|
|
|
- <span class="pinyin">{{
|
|
|
|
|
- item.roleDetail.detail.wordsList | handlePinyin
|
|
|
|
|
- }}</span>
|
|
|
|
|
- <span class="chs">{{
|
|
|
|
|
- item.roleDetail.detail.wordsList | handleChs
|
|
|
|
|
- }}</span>
|
|
|
|
|
|
|
+ <span
|
|
|
|
|
+ class="pinyin"
|
|
|
|
|
+ :style="{ fontSize: baseSizePhone + 'px' }"
|
|
|
|
|
+ >{{ item.roleDetail.detail.wordsList | handlePinyin }}</span
|
|
|
|
|
+ >
|
|
|
|
|
+ <span
|
|
|
|
|
+ class="chs"
|
|
|
|
|
+ :style="{ fontSize: baseSizePhone + 6 + 'px' }"
|
|
|
|
|
+ >{{ item.roleDetail.detail.wordsList | handleChs }}</span
|
|
|
|
|
+ >
|
|
|
</div>
|
|
</div>
|
|
|
<div
|
|
<div
|
|
|
class="para-con"
|
|
class="para-con"
|
|
@@ -621,6 +646,7 @@
|
|
|
<div
|
|
<div
|
|
|
v-if="item.enwords && enPosition && enPosition == 'top'"
|
|
v-if="item.enwords && enPosition && enPosition == 'top'"
|
|
|
class="enwords"
|
|
class="enwords"
|
|
|
|
|
+ :style="{ fontSize: baseSizePhone + 'px' }"
|
|
|
>
|
|
>
|
|
|
{{ item.enwords }}
|
|
{{ item.enwords }}
|
|
|
</div>
|
|
</div>
|
|
@@ -631,9 +657,11 @@
|
|
|
:key="'wordsList' + pIndex"
|
|
:key="'wordsList' + pIndex"
|
|
|
>
|
|
>
|
|
|
<template v-if="!pItem.isHeng">
|
|
<template v-if="!pItem.isHeng">
|
|
|
- <span class="NNPE-para-pinyin padding">{{
|
|
|
|
|
- pItem.con
|
|
|
|
|
- }}</span>
|
|
|
|
|
|
|
+ <span
|
|
|
|
|
+ class="NNPE-para-pinyin padding"
|
|
|
|
|
+ :style="{ fontSize: baseSizePhone + 'px' }"
|
|
|
|
|
+ >{{ pItem.con }}</span
|
|
|
|
|
+ >
|
|
|
</template>
|
|
</template>
|
|
|
<template v-else>
|
|
<template v-else>
|
|
|
<template v-if="judgeAnswer == 'standardAnswer'">
|
|
<template v-if="judgeAnswer == 'standardAnswer'">
|
|
@@ -696,6 +724,7 @@
|
|
|
(!enPosition || (enPosition && enPosition == 'bottom'))
|
|
(!enPosition || (enPosition && enPosition == 'bottom'))
|
|
|
"
|
|
"
|
|
|
class="enwords"
|
|
class="enwords"
|
|
|
|
|
+ :style="{ fontSize: baseSizePhone + 'px' }"
|
|
|
>
|
|
>
|
|
|
{{ item.enwords }}
|
|
{{ item.enwords }}
|
|
|
</div>
|
|
</div>
|
|
@@ -785,7 +814,8 @@ export default {
|
|
|
"TaskModel",
|
|
"TaskModel",
|
|
|
"judgeAnswer",
|
|
"judgeAnswer",
|
|
|
"audioWidth",
|
|
"audioWidth",
|
|
|
- "enPosition"
|
|
|
|
|
|
|
+ "enPosition",
|
|
|
|
|
+ "baseSizePhone"
|
|
|
],
|
|
],
|
|
|
components: {
|
|
components: {
|
|
|
AudioLine,
|
|
AudioLine,
|
|
@@ -881,12 +911,11 @@ export default {
|
|
|
},
|
|
},
|
|
|
hengStyle() {
|
|
hengStyle() {
|
|
|
return function(config) {
|
|
return function(config) {
|
|
|
- let sizeVal =
|
|
|
|
|
- config && config.fontSize ? config.fontSize.replace("px", "") : 20;
|
|
|
|
|
|
|
+ let sizeVal = this.baseSizePhone + 6;
|
|
|
return {
|
|
return {
|
|
|
minHeight: Number(sizeVal) + 13 + "px",
|
|
minHeight: Number(sizeVal) + 13 + "px",
|
|
|
lineHeight: Number(sizeVal) + 12 + "px",
|
|
lineHeight: Number(sizeVal) + 12 + "px",
|
|
|
- fontSize: config ? config.fontSize : "20px",
|
|
|
|
|
|
|
+ fontSize: sizeVal + "px",
|
|
|
fontFamily: config ? config.fontFamily : "FZJCGFKTK",
|
|
fontFamily: config ? config.fontFamily : "FZJCGFKTK",
|
|
|
textAlign:
|
|
textAlign:
|
|
|
config && config.DiaTextAlign ? config.DiaTextAlign : "left",
|
|
config && config.DiaTextAlign ? config.DiaTextAlign : "left",
|
|
@@ -899,8 +928,7 @@ export default {
|
|
|
},
|
|
},
|
|
|
boxStyle() {
|
|
boxStyle() {
|
|
|
return function(config, isHasPY) {
|
|
return function(config, isHasPY) {
|
|
|
- let sizeVal =
|
|
|
|
|
- config && config.fontSize ? config.fontSize.replace("px", "") : 20;
|
|
|
|
|
|
|
+ let sizeVal = this.baseSizePhone;
|
|
|
return {
|
|
return {
|
|
|
minHeight: Number(sizeVal) + 13 + (isHasPY ? 18 : 0) + "px"
|
|
minHeight: Number(sizeVal) + 13 + (isHasPY ? 18 : 0) + "px"
|
|
|
};
|
|
};
|
|
@@ -1323,7 +1351,7 @@ export default {
|
|
|
&.NNPE-chs {
|
|
&.NNPE-chs {
|
|
|
font-family: "FZJCGFKTK";
|
|
font-family: "FZJCGFKTK";
|
|
|
font-size: 20px;
|
|
font-size: 20px;
|
|
|
- line-height: 32px;
|
|
|
|
|
|
|
+ // line-height: 1.6;
|
|
|
min-height: 33px;
|
|
min-height: 33px;
|
|
|
color: #000000;
|
|
color: #000000;
|
|
|
&.active {
|
|
&.active {
|
|
@@ -1385,7 +1413,7 @@ export default {
|
|
|
&.NNPE-chs {
|
|
&.NNPE-chs {
|
|
|
font-family: "FZJCGFKTK";
|
|
font-family: "FZJCGFKTK";
|
|
|
font-size: 20px;
|
|
font-size: 20px;
|
|
|
- line-height: 32px;
|
|
|
|
|
|
|
+ // line-height: 1.6;
|
|
|
min-height: 33px;
|
|
min-height: 33px;
|
|
|
color: #000000;
|
|
color: #000000;
|
|
|
&.active {
|
|
&.active {
|
|
@@ -1452,14 +1480,14 @@ export default {
|
|
|
.pinyin {
|
|
.pinyin {
|
|
|
font-family: "GB-PINYINOK-B";
|
|
font-family: "GB-PINYINOK-B";
|
|
|
font-size: 14px;
|
|
font-size: 14px;
|
|
|
- line-height: 18px;
|
|
|
|
|
|
|
+ line-height: 1.4;
|
|
|
color: rgba(0, 0, 0, 0.85);
|
|
color: rgba(0, 0, 0, 0.85);
|
|
|
margin-right: 4px;
|
|
margin-right: 4px;
|
|
|
}
|
|
}
|
|
|
.chs {
|
|
.chs {
|
|
|
font-family: "FZJCGFKTK";
|
|
font-family: "FZJCGFKTK";
|
|
|
font-size: 20px;
|
|
font-size: 20px;
|
|
|
- line-height: 24px;
|
|
|
|
|
|
|
+ line-height: 1.2;
|
|
|
color: rgba(0, 0, 0, 0.85);
|
|
color: rgba(0, 0, 0, 0.85);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -1525,7 +1553,7 @@ export default {
|
|
|
padding: 0 10px;
|
|
padding: 0 10px;
|
|
|
box-sizing: border-box;
|
|
box-sizing: border-box;
|
|
|
color: #000000;
|
|
color: #000000;
|
|
|
- line-height: 26px;
|
|
|
|
|
|
|
+ line-height: 1.3;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
.NPC-ArticleAnswerView {
|
|
.NPC-ArticleAnswerView {
|