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

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

@@ -132,6 +132,13 @@
                               pItem.className ? pItem.className : '',
                               noFont.indexOf(pItem.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',
+                            }"
                             @click.stop="
                               viewNotes(
                                 $event,
@@ -143,7 +150,25 @@
                             "
                             >{{ pItem.pinyin }}</span
                           >
-                          <span class="NNPE-chs">
+                          <span
+                            class="NNPE-chs"
+                            :style="{
+                              fontFamily: pItem.config.fontFamily,
+                              height:
+                                attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
+                              fontSize: attrib && attrib.font_size ? attrib.font_size : '20px',
+                              lineHeight:
+                                attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
+                              display: 'inline-block',
+                              color:
+                                paraIndex == pItem.paraIndex &&
+                                sentIndex == pItem.sentIndex &&
+                                wordIndex == pItem.wordIndex &&
+                                attrib
+                                  ? attrib.topic_color
+                                  : '',
+                            }"
+                          >
                             <template>
                               <span
                                 v-for="(wItem, wIndex) in pItem.leg"
@@ -158,7 +183,10 @@
                                 ]"
                                 :style="{
                                   fontFamily: pItem.config.fontFamily,
-                                  height: '28px',
+                                  height:
+                                    attrib && attrib.font_size
+                                      ? attrib.font_size.replace('pt', '') * 1.4 + 'pt'
+                                      : '28px',
                                   display: 'inline-block',
                                   color:
                                     pItem.chstimeList &&
@@ -168,6 +196,11 @@
                                     attrib
                                       ? attrib.topic_color
                                       : '',
+                                  fontSize: attrib && attrib.font_size ? attrib.font_size : '20px',
+                                  lineHeight:
+                                    attrib && attrib.font_size
+                                      ? attrib.font_size.replace('pt', '') * 1.4 + 'pt'
+                                      : '28px',
                                 }"
                                 @click.stop="
                                   viewNotes(
@@ -189,6 +222,13 @@
                               pItem.className ? pItem.className : '',
                               noFont.indexOf(pItem.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',
+                            }"
                             @click.stop="
                               viewNotes(
                                 $event,
@@ -207,6 +247,14 @@
                             class="NNPE-pinyin"
                             :class="[noFont.indexOf(item.wordsList[pIndex + 1].pinyin) > -1 ? 'noFont' : '']"
                             style="text-align: left"
+                            style="text-align: left"
+                            :style="{
+                              fontSize: attrib && attrib.pinyin_size ? attrib.pinyin_size : '14px',
+                              height:
+                                attrib && attrib.pinyin_size
+                                  ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
+                                  : '22px',
+                            }"
                             @click.stop="
                               viewNotes(
                                 $event,
@@ -232,7 +280,8 @@
                             ]"
                             :style="{
                               fontFamily: item.wordsList[pIndex + 1].config.fontFamily,
-                              height: '28px',
+                              height:
+                                attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
                               display: 'inline-block',
                               color:
                                 pItem.chstimeList &&
@@ -243,6 +292,9 @@
                                 attrib
                                   ? attrib.topic_color
                                   : '',
+                              fontSize: attrib && attrib.font_size ? attrib.font_size : '20px',
+                              lineHeight:
+                                attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
                             }"
                             @click.stop="
                               viewNotes(
@@ -264,6 +316,14 @@
                             class="NNPE-pinyin"
                             :class="[noFont.indexOf(item.wordsList[pIndex + 1].pinyin) > -1 ? 'noFont' : '']"
                             style="text-align: left"
+                            style="text-align: left"
+                            :style="{
+                              fontSize: attrib && attrib.pinyin_size ? attrib.pinyin_size : '14px',
+                              height:
+                                attrib && attrib.pinyin_size
+                                  ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
+                                  : '22px',
+                            }"
                             @click.stop="
                               viewNotes(
                                 $event,
@@ -292,6 +352,14 @@
                               noFont.indexOf(item.wordsList[pIndex + 2].pinyin) > -1 ? 'noFont' : '',
                             ]"
                             style="text-align: left"
+                            style="text-align: left"
+                            :style="{
+                              fontSize: attrib && attrib.pinyin_size ? attrib.pinyin_size : '14px',
+                              height:
+                                attrib && attrib.pinyin_size
+                                  ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
+                                  : '22px',
+                            }"
                             @click.stop="
                               viewNotes(
                                 $event,
@@ -317,7 +385,8 @@
                             ]"
                             :style="{
                               fontFamily: item.wordsList[pIndex + 2].config.fontFamily,
-                              height: '28px',
+                              height:
+                                attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
                               display: 'inline-block',
                               color:
                                 pItem.chstimeList &&
@@ -328,6 +397,9 @@
                                 attrib
                                   ? attrib.topic_color
                                   : '',
+                              fontSize: attrib && attrib.font_size ? attrib.font_size : '20px',
+                              lineHeight:
+                                attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
                             }"
                             @click.stop="
                               viewNotes(
@@ -351,6 +423,14 @@
                               noFont.indexOf(item.wordsList[pIndex + 2].pinyin) > -1 ? 'noFont' : '',
                             ]"
                             style="text-align: left"
+                            style="text-align: left"
+                            :style="{
+                              fontSize: attrib && attrib.pinyin_size ? attrib.pinyin_size : '14px',
+                              height:
+                                attrib && attrib.pinyin_size
+                                  ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
+                                  : '22px',
+                            }"
                             @click.stop="
                               viewNotes(
                                 $event,
@@ -373,6 +453,11 @@
                             pItem.className ? pItem.className : '',
                             noFont.indexOf(pItem.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',
+                          }"
                           @click.stop="
                             viewNotes(
                               $event,
@@ -389,6 +474,22 @@
                           v-if="pItem.chs != '#'"
                           class="NNPE-chs"
                           :class="[pItem.chs != '“' && pItem.padding && config.isShowPY ? 'padding' : '']"
+                          :style="{
+                            fontFamily: pItem.config.fontFamily,
+                            height:
+                              attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
+                            fontSize: attrib && attrib.font_size ? attrib.font_size : '20px',
+                            lineHeight:
+                              attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
+                            display: 'inline-block',
+                            color:
+                              paraIndex == pItem.paraIndex &&
+                              sentIndex == pItem.sentIndex &&
+                              wordIndex == pItem.wordIndex &&
+                              attrib
+                                ? attrib.topic_color
+                                : '',
+                          }"
                         >
                           <template>
                             <span
@@ -404,7 +505,8 @@
                               ]"
                               :style="{
                                 fontFamily: pItem.config.fontFamily,
-                                height: '28px',
+                                height:
+                                  attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
                                 display: 'inline-block',
                                 color:
                                   pItem.chstimeList &&
@@ -414,6 +516,9 @@
                                   attrib
                                     ? attrib.topic_color
                                     : '',
+                                fontSize: attrib && attrib.font_size ? attrib.font_size : '20px',
+                                lineHeight:
+                                  attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
                               }"
                               @click.stop="
                                 viewNotes(
@@ -436,6 +541,11 @@
                             pItem.className ? pItem.className : '',
                             noFont.indexOf(pItem.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',
+                          }"
                           @click.stop="
                             viewNotes(
                               $event,
@@ -1088,6 +1198,7 @@ export default {
 
     .NNPE-words {
       float: left;
+      padding-bottom: 5px;
 
       &-box {
         float: left;
@@ -1100,7 +1211,7 @@ export default {
             font-family: 'League';
             font-size: 14px;
             font-weight: normal;
-            line-height: 22px;
+            line-height: 1.5;
             color: #000;
 
             &.noFont {
@@ -1119,7 +1230,7 @@ export default {
           &.NNPE-chs {
             font-family: '楷体';
             font-size: 20px;
-            line-height: 28px;
+            line-height: 1.4;
             color: #000;
 
             &.active {
@@ -1161,7 +1272,7 @@ export default {
           font-family: 'League';
           font-size: 14px;
           font-weight: normal;
-          line-height: 22px;
+          line-height: 1.5;
           color: #000;
 
           &.noFont {
@@ -1180,7 +1291,7 @@ export default {
         &.NNPE-chs {
           font-family: '楷体';
           font-size: 20px;
-          line-height: 28px;
+          line-height: 1.4;
           color: #000;
 
           &.active {

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

@@ -112,6 +112,13 @@
                               noFont.indexOf(item.pinyin) > -1 ? 'noFont' : '',
                             ]"
                             @click.stop="viewNotes($event, pItem.pinyin)"
+                            :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
                           >
                           <span
@@ -122,7 +129,11 @@
                             ]"
                             :style="{
                               fontFamily: pItem.config.fontFamily,
-                              height: '28px',
+                              height:
+                                attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
+                              fontSize: attrib && attrib.font_size ? attrib.font_size : '20px',
+                              lineHeight:
+                                attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
                               display: 'inline-block',
                               color:
                                 newWordList.indexOf(pItem.chs) > -1 || pItem.words
@@ -142,6 +153,13 @@
                               noFont.indexOf(item.pinyin) > -1 ? 'noFont' : '',
                             ]"
                             @click.stop="viewNotes($event, pItem.pinyin)"
+                            :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
                           >
                         </span>
@@ -152,6 +170,13 @@
                             style="text-align: left"
                             :class="[noFont.indexOf(item.wordsList[pIndex + 1].pinyin) > -1 ? 'noFont' : '']"
                             @click.stop="viewNotes($event, item.wordsList[pIndex + 1].pinyin)"
+                            :style="{
+                              fontSize: attrib && attrib.pinyin_size ? attrib.pinyin_size : '14px',
+                              height:
+                                attrib && attrib.pinyin_size
+                                  ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
+                                  : '22px',
+                            }"
                             >{{ item.wordsList[pIndex + 1].pinyin }}</span
                           >
                           <span
@@ -159,7 +184,11 @@
                             style="text-align: left"
                             :style="{
                               fontFamily: item.wordsList[pIndex + 1].config.fontFamily,
-                              height: '28px',
+                              height:
+                                attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
+                              fontSize: attrib && attrib.font_size ? attrib.font_size : '20px',
+                              lineHeight:
+                                attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
                               display: 'inline-block',
                             }"
                             @click.stop="
@@ -182,6 +211,13 @@
                             :class="[noFont.indexOf(item.wordsList[pIndex + 1].pinyin) > -1 ? 'noFont' : '']"
                             style="text-align: left"
                             @click.stop="viewNotes($event, item.wordsList[pIndex + 1].pinyin)"
+                            :style="{
+                              fontSize: attrib && attrib.pinyin_size ? attrib.pinyin_size : '14px',
+                              height:
+                                attrib && attrib.pinyin_size
+                                  ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
+                                  : '22px',
+                            }"
                             >{{ item.wordsList[pIndex + 1].pinyin }}</span
                           >
                         </span>
@@ -201,6 +237,13 @@
                               noFont.indexOf(item.wordsList[pIndex + 2].pinyin) > -1 ? 'noFont' : '',
                             ]"
                             style="text-align: left"
+                            :style="{
+                              fontSize: attrib && attrib.pinyin_size ? attrib.pinyin_size : '14px',
+                              height:
+                                attrib && attrib.pinyin_size
+                                  ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
+                                  : '22px',
+                            }"
                             @click.stop="viewNotes($event, item.wordsList[pIndex + 2].pinyin)"
                             >{{ item.wordsList[pIndex + 2].pinyin }}</span
                           >
@@ -218,7 +261,11 @@
                             ]"
                             :style="{
                               fontFamily: item.wordsList[pIndex + 2].config.fontFamily,
-                              height: '28px',
+                              height:
+                                attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
+                              fontSize: attrib && attrib.font_size ? attrib.font_size : '20px',
+                              lineHeight:
+                                attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
                               display: 'inline-block',
                             }"
                             @click.stop="
@@ -242,6 +289,13 @@
                               noFont.indexOf(item.wordsList[pIndex + 2].pinyin) > -1 ? 'noFont' : '',
                             ]"
                             style="text-align: left"
+                            :style="{
+                              fontSize: attrib && attrib.pinyin_size ? attrib.pinyin_size : '14px',
+                              height:
+                                attrib && attrib.pinyin_size
+                                  ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
+                                  : '22px',
+                            }"
                             @click.stop="viewNotes($event, item.wordsList[pIndex + 2].pinyin)"
                             >{{ item.wordsList[pIndex + 2].pinyin }}</span
                           >
@@ -256,6 +310,11 @@
                             pItem.className ? pItem.className : '',
                             noFont.indexOf(pItem.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',
+                          }"
                           @click.stop="viewNotes($event, pItem.pinyin)"
                           >{{ pItem.pinyin }}</span
                         >
@@ -269,7 +328,11 @@
                           ]"
                           :style="{
                             fontFamily: pItem.config.fontFamily,
-                            height: '28px',
+                            height:
+                              attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
+                            fontSize: attrib && attrib.font_size ? attrib.font_size : '20px',
+                            lineHeight:
+                              attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
                             display: 'inline-block',
                             color:
                               newWordList.indexOf(pItem.chs) > -1 || pItem.words
@@ -289,6 +352,11 @@
                             pItem.className ? pItem.className : '',
                             noFont.indexOf(pItem.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',
+                          }"
                           @click.stop="viewNotes($event, pItem.pinyin)"
                           >{{ pItem.pinyin }}</span
                         >
@@ -1118,6 +1186,7 @@ export default {
 
     .NNPE-words {
       float: left;
+      padding-bottom: 5px;
 
       &-box {
         float: left;
@@ -1130,7 +1199,7 @@ export default {
             font-family: 'League';
             font-size: 14px;
             font-weight: normal;
-            line-height: 22px;
+            line-height: 1.5;
             color: #000;
 
             &.noFont {
@@ -1145,7 +1214,7 @@ export default {
           &.NNPE-chs {
             font-family: '楷体';
             font-size: 20px;
-            line-height: 28px;
+            line-height: 1.4;
             color: #000;
 
             &.active {
@@ -1187,7 +1256,7 @@ export default {
           font-family: 'League';
           font-size: 14px;
           font-weight: normal;
-          line-height: 22px;
+          line-height: 1.5;
           color: #000;
 
           &.noFont {
@@ -1202,7 +1271,7 @@ export default {
         &.NNPE-chs {
           font-family: '楷体';
           font-size: 20px;
-          line-height: 28px;
+          line-height: 1.4;
           color: #000;
 
           &.active {

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

@@ -204,6 +204,13 @@
                                   sentIndex == index ? 'wordBlank' : '',
                                   noFont.indexOf(pItem.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>
@@ -232,7 +239,15 @@
                                   ]"
                                   :style="{
                                     fontFamily: pItem.config.fontFamily,
-                                    height: '28px',
+                                    height:
+                                      attrib && attrib.font_size
+                                        ? attrib.font_size.replace('pt', '') * 1.4 + 'pt'
+                                        : '28px',
+                                    fontSize: attrib && attrib.font_size ? attrib.font_size : '20px',
+                                    lineHeight:
+                                      attrib && attrib.font_size
+                                        ? attrib.font_size.replace('pt', '') * 1.4 + 'pt'
+                                        : '28px',
                                     display: 'inline-block',
                                     color:
                                       isPlaying &&
@@ -259,6 +274,13 @@
                                   sentIndex == index ? 'wordBlank' : '',
                                   noFont.indexOf(pItem.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>
@@ -273,6 +295,13 @@
                                   noFont.indexOf(item.sentArr[pIndex + 1].pinyin) > -1 ? 'noFont' : '',
                                 ]"
                                 style="text-align: left"
+                                :style="{
+                                  fontSize: attrib && attrib.pinyin_size ? attrib.pinyin_size : '14px',
+                                  height:
+                                    attrib && attrib.pinyin_size
+                                      ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
+                                      : '22px',
+                                }"
                                 >{{ item.sentArr[pIndex + 1].pinyin }}</span
                               >
                             </template>
@@ -291,7 +320,15 @@
                                 ]"
                                 :style="{
                                   fontFamily: item.sentArr[pIndex + 1].config.fontFamily,
-                                  height: '28px',
+                                  height:
+                                    attrib && attrib.font_size
+                                      ? attrib.font_size.replace('pt', '') * 1.4 + 'pt'
+                                      : '28px',
+                                  fontSize: attrib && attrib.font_size ? attrib.font_size : '20px',
+                                  lineHeight:
+                                    attrib && attrib.font_size
+                                      ? attrib.font_size.replace('pt', '') * 1.4 + 'pt'
+                                      : '28px',
                                   display: 'inline-block',
                                   color:
                                     isPlaying &&
@@ -321,6 +358,13 @@
                                   noFont.indexOf(item.sentArr[pIndex + 1].pinyin) > -1 ? 'noFont' : '',
                                 ]"
                                 style="text-align: left"
+                                :style="{
+                                  fontSize: attrib && attrib.pinyin_size ? attrib.pinyin_size : '14px',
+                                  height:
+                                    attrib && attrib.pinyin_size
+                                      ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
+                                      : '22px',
+                                }"
                                 >{{ item.sentArr[pIndex + 1].pinyin }}</span
                               >
                             </template>
@@ -342,6 +386,13 @@
                                   noFont.indexOf(item.sentArr[pIndex + 2].pinyin) > -1 ? 'noFont' : '',
                                 ]"
                                 style="text-align: left"
+                                :style="{
+                                  fontSize: attrib && attrib.pinyin_size ? attrib.pinyin_size : '14px',
+                                  height:
+                                    attrib && attrib.pinyin_size
+                                      ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
+                                      : '22px',
+                                }"
                                 >{{ item.sentArr[pIndex + 2].pinyin }}</span
                               >
                             </template>
@@ -360,7 +411,15 @@
                                 ]"
                                 :style="{
                                   fontFamily: item.sentArr[pIndex + 2].config.fontFamily,
-                                  height: '28px',
+                                  height:
+                                    attrib && attrib.font_size
+                                      ? attrib.font_size.replace('pt', '') * 1.4 + 'pt'
+                                      : '28px',
+                                  fontSize: attrib && attrib.font_size ? attrib.font_size : '20px',
+                                  lineHeight:
+                                    attrib && attrib.font_size
+                                      ? attrib.font_size.replace('pt', '') * 1.4 + 'pt'
+                                      : '28px',
                                   display: 'inline-block',
                                   color:
                                     isPlaying &&
@@ -390,6 +449,13 @@
                                   noFont.indexOf(item.sentArr[pIndex + 2].pinyin) > -1 ? 'noFont' : '',
                                 ]"
                                 style="text-align: left"
+                                :style="{
+                                  fontSize: attrib && attrib.pinyin_size ? attrib.pinyin_size : '14px',
+                                  height:
+                                    attrib && attrib.pinyin_size
+                                      ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
+                                      : '22px',
+                                }"
                                 >{{ item.sentArr[pIndex + 2].pinyin }}</span
                               >
                             </template>
@@ -407,6 +473,13 @@
                                   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>
@@ -436,7 +509,15 @@
                                 ]"
                                 :style="{
                                   fontFamily: pItem.config.fontFamily,
-                                  height: '28px',
+                                  height:
+                                    attrib && attrib.font_size
+                                      ? attrib.font_size.replace('pt', '') * 1.4 + 'pt'
+                                      : '28px',
+                                  fontSize: attrib && attrib.font_size ? attrib.font_size : '20px',
+                                  lineHeight:
+                                    attrib && attrib.font_size
+                                      ? attrib.font_size.replace('pt', '') * 1.4 + 'pt'
+                                      : '28px',
                                   display: 'inline-block',
                                   color:
                                     isPlaying &&
@@ -464,6 +545,13 @@
                                   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>
@@ -1266,6 +1354,7 @@ export default {
 
     .NNPE-words {
       float: left;
+      padding-bottom: 5px;
 
       &-box {
         float: left;
@@ -1278,7 +1367,7 @@ export default {
             font-family: 'League';
             font-size: 14px;
             font-weight: normal;
-            line-height: 20px;
+            line-height: 1.5;
 
             &.noFont {
               font-family: initial;
@@ -1296,7 +1385,7 @@ export default {
           &.NNPE-chs {
             font-family: '楷体';
             font-size: 20px;
-            line-height: 28px;
+            line-height: 1.4;
 
             .active {
               color: #de4444;
@@ -1333,7 +1422,7 @@ export default {
           font-family: 'League';
           font-size: 14px;
           font-weight: normal;
-          line-height: 20px;
+          line-height: 1.5;
 
           &.noFont {
             font-family: initial;
@@ -1351,7 +1440,7 @@ export default {
         &.NNPE-chs {
           font-family: '楷体';
           font-size: 20px;
-          line-height: 28px;
+          line-height: 1.4;
 
           .active {
             color: #de4444;

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

@@ -110,6 +110,13 @@
                               pItem.className ? pItem.className : '',
                               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
                           >
                           <span
@@ -124,7 +131,11 @@
                             ]"
                             :style="{
                               fontFamily: pItem.config.fontFamily,
-                              height: '28px',
+                              height:
+                                attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
+                              fontSize: attrib && attrib.font_size ? attrib.font_size : '20px',
+                              lineHeight:
+                                attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
                               display: 'inline-block',
                               color:
                                 paraIndex == pItem.paraIndex &&
@@ -143,6 +154,13 @@
                               pItem.className ? pItem.className : '',
                               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
                           >
                         </span>
@@ -152,6 +170,13 @@
                             class="NNPE-pinyin"
                             :class="[noFont.indexOf(item.wordsList[pIndex + 1].pinyin) > -1 ? 'noFont' : '']"
                             style="text-align: left"
+                            :style="{
+                              fontSize: attrib && attrib.pinyin_size ? attrib.pinyin_size : '14px',
+                              height:
+                                attrib && attrib.pinyin_size
+                                  ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
+                                  : '22px',
+                            }"
                             >{{ item.wordsList[pIndex + 1].pinyin }}</span
                           >
                           <span
@@ -159,7 +184,11 @@
                             style="text-align: left"
                             :style="{
                               fontFamily: item.wordsList[pIndex + 1].config.fontFamily,
-                              height: '28px',
+                              height:
+                                attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
+                              fontSize: attrib && attrib.font_size ? attrib.font_size : '20px',
+                              lineHeight:
+                                attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
                               display: 'inline-block',
                             }"
                             >{{
@@ -173,6 +202,13 @@
                             class="NNPE-pinyin"
                             :class="[noFont.indexOf(item.wordsList[pIndex + 1].pinyin) > -1 ? 'noFont' : '']"
                             style="text-align: left"
+                            :style="{
+                              fontSize: attrib && attrib.pinyin_size ? attrib.pinyin_size : '14px',
+                              height:
+                                attrib && attrib.pinyin_size
+                                  ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
+                                  : '22px',
+                            }"
                             >{{ item.wordsList[pIndex + 1].pinyin }}</span
                           >
                         </span>
@@ -192,6 +228,13 @@
                               noFont.indexOf(item.wordsList[pIndex + 2].pinyin) > -1 ? 'noFont' : '',
                             ]"
                             style="text-align: left"
+                            :style="{
+                              fontSize: attrib && attrib.pinyin_size ? attrib.pinyin_size : '14px',
+                              height:
+                                attrib && attrib.pinyin_size
+                                  ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
+                                  : '22px',
+                            }"
                             >{{ item.wordsList[pIndex + 2].pinyin }}</span
                           >
                           <span
@@ -209,7 +252,11 @@
                             ]"
                             :style="{
                               fontFamily: item.wordsList[pIndex + 2].config.fontFamily,
-                              height: '28px',
+                              height:
+                                attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
+                              fontSize: attrib && attrib.font_size ? attrib.font_size : '20px',
+                              lineHeight:
+                                attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
                               display: 'inline-block',
                             }"
                             >{{
@@ -225,6 +272,13 @@
                               noFont.indexOf(item.wordsList[pIndex + 2].pinyin) > -1 ? 'noFont' : '',
                             ]"
                             style="text-align: left"
+                            :style="{
+                              fontSize: attrib && attrib.pinyin_size ? attrib.pinyin_size : '14px',
+                              height:
+                                attrib && attrib.pinyin_size
+                                  ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
+                                  : '22px',
+                            }"
                             >{{ item.wordsList[pIndex + 2].pinyin }}</span
                           >
                         </span>
@@ -239,6 +293,11 @@
                             noFont.indexOf(item.pinyin) > -1 ? 'noFont' : '',
                           ]"
                           @click="showWordDetail($event, pItem)"
+                          :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
                         >
                         <span
@@ -252,7 +311,11 @@
                           ]"
                           :style="{
                             fontFamily: pItem.config.fontFamily,
-                            height: '28px',
+                            height:
+                              attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
+                            fontSize: attrib && attrib.font_size ? attrib.font_size : '20px',
+                            lineHeight:
+                              attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
                             display: 'inline-block',
                             color:
                               paraIndex == pItem.paraIndex &&
@@ -273,6 +336,11 @@
                             pItem.className ? pItem.className : '',
                             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',
+                          }"
                           @click="showWordDetail($event, pItem)"
                           >{{ pItem.pinyin }}</span
                         >
@@ -1009,6 +1077,7 @@ export default {
 
     .NNPE-words {
       float: left;
+      padding-bottom: 5px;
 
       &-box {
         float: left;
@@ -1021,7 +1090,7 @@ export default {
             font-family: 'League';
             font-size: 14px;
             font-weight: normal;
-            line-height: 22px;
+            line-height: 1.5;
             color: #000;
 
             &.noFont {
@@ -1036,7 +1105,7 @@ export default {
           &.NNPE-chs {
             font-family: '楷体';
             font-size: 20px;
-            line-height: 28px;
+            line-height: 1.4;
             color: #000;
 
             &.active {
@@ -1074,7 +1143,7 @@ export default {
           font-family: 'League';
           font-size: 14px;
           font-weight: normal;
-          line-height: 22px;
+          line-height: 1.5;
           color: #000;
 
           &.noFont {
@@ -1089,7 +1158,7 @@ export default {
         &.NNPE-chs {
           font-family: '楷体';
           font-size: 20px;
-          line-height: 28px;
+          line-height: 1.4;
           color: #000;
 
           &.active {