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

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

@@ -109,6 +109,13 @@
                                 pItem.articleSentIndex,
                               )
                             "
+                            :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
@@ -125,7 +132,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',
                               backgroundColor:
                                 item.timeList &&
@@ -195,6 +206,13 @@
                                 pItem.articleSentIndex,
                               )
                             "
+                            :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>
@@ -215,6 +233,13 @@
                                 pItem.articleSentIndex,
                               )
                             "
+                            :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
@@ -240,7 +265,11 @@
                             ]"
                             :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',
                               width: item.wordsList[pIndex + 1].chs.trim() === '' ? '6px' : '',
                               backgroundColor:
@@ -294,6 +323,13 @@
                                 pItem.articleSentIndex,
                               )
                             "
+                            :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>
@@ -322,6 +358,13 @@
                                 pItem.articleSentIndex,
                               )
                             "
+                            :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
@@ -347,7 +390,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',
                               width: item.wordsList[pIndex + 2].chs.trim() === '' ? '6px' : '',
                               backgroundColor:
@@ -401,6 +448,13 @@
                                 pItem.articleSentIndex,
                               )
                             "
+                            :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>
@@ -423,6 +477,11 @@
                               pItem.articleSentIndex,
                             )
                           "
+                          :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
@@ -465,7 +524,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',
                                 width: pItem.chs[wIndex].trim() === '' ? '6px' : '',
                                 color:
@@ -508,6 +571,11 @@
                               pItem.articleSentIndex,
                             )
                           "
+                          :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>
@@ -604,6 +672,13 @@
                                 index,
                               )
                             "
+                            :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>
@@ -629,7 +704,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',
                                 width: pItem.chs[wIndex].trim() === '' ? '6px' : '',
                               }"
@@ -664,6 +743,13 @@
                                 index,
                               )
                             "
+                            :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>
@@ -687,10 +773,27 @@
                                 index,
                               )
                             "
+                            :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>
-                        <span class="NNPE-chs" style="text-align: left">
+                        <span
+                          class="NNPE-chs"
+                          style="text-align: left"
+                          :style="{
+                            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',
+                          }"
+                        >
                           <span
                             :class="[
                               pItem.timeList[pItem.leg - 1] &&
@@ -704,7 +807,11 @@
                             ]"
                             :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',
                               width: item.sentArr[pIndex + 1].chs.trim() === '' ? '6px' : '',
                             }"
@@ -743,6 +850,13 @@
                                 index,
                               )
                             "
+                            :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>
@@ -773,6 +887,13 @@
                                 index,
                               )
                             "
+                            :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>
@@ -790,7 +911,11 @@
                             ]"
                             :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',
                               width: item.sentArr[pIndex + 2].chs.trim() === '' ? '6px' : '',
                             }"
@@ -829,6 +954,13 @@
                                 index,
                               )
                             "
+                            :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>
@@ -854,6 +986,11 @@
                               index,
                             )
                           "
+                          :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>
@@ -863,6 +1000,12 @@
                           pItem.chs != '“' && pItem.padding && config.isShowPY ? 'padding' : '',
                           sentIndex == index ? 'wordBlank' : '',
                         ]"
+                        :style="{
+                          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',
+                        }"
                       >
                         <template>
                           <span
@@ -880,7 +1023,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',
                               width: pItem.chs[wIndex].trim() === '' ? '6px' : '',
                             }"
@@ -916,6 +1063,11 @@
                               index,
                             )
                           "
+                          :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>
@@ -1457,6 +1609,7 @@ export default {
 
     .NNPE-words {
       float: left;
+      padding-bottom: 5px;
 
       &-box {
         float: left;
@@ -1469,7 +1622,7 @@ export default {
             font-family: 'League';
             font-size: 14px;
             font-weight: normal;
-            line-height: 22px;
+            line-height: 1.5;
             color: #000;
 
             &.noFont {
@@ -1490,7 +1643,7 @@ export default {
             flex-flow: wrap;
             font-family: '楷体';
             font-size: 20px;
-            line-height: 28px;
+            line-height: 1.4;
             color: #000;
 
             &.overActive {
@@ -1540,7 +1693,7 @@ export default {
           font-family: 'League';
           font-size: 14px;
           font-weight: normal;
-          line-height: 22px;
+          line-height: 1.5;
           color: #000;
 
           &.noFont {
@@ -1561,7 +1714,7 @@ export default {
           flex-flow: wrap;
           font-family: '楷体';
           font-size: 20px;
-          line-height: 28px;
+          line-height: 1.4;
           color: #000;
 
           &.overActive {

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

@@ -95,6 +95,13 @@
                               noFont.indexOf(pItem.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
@@ -105,7 +112,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
@@ -125,6 +136,13 @@
                               noFont.indexOf(pItem.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>
@@ -136,6 +154,13 @@
                               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',
+                            }"
                             @click.stop="viewNotes($event, item.wordsList[pIndex + 1].pinyin)"
                             >{{ item.wordsList[pIndex + 1].pinyin }}</span
                           >
@@ -144,7 +169,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="
@@ -168,6 +197,13 @@
                               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',
+                            }"
                             @click.stop="viewNotes($event, item.wordsList[pIndex + 1].pinyin)"
                             >{{ item.wordsList[pIndex + 1].pinyin }}</span
                           >
@@ -189,6 +225,13 @@
                               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',
+                            }"
                             @click.stop="viewNotes($event, item.wordsList[pIndex + 2].pinyin)"
                             >{{ item.wordsList[pIndex + 2].pinyin }}</span
                           >
@@ -197,7 +240,11 @@
                             style="text-align: left"
                             :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="
@@ -221,6 +268,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
                           >
@@ -235,6 +289,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
                         >
@@ -247,7 +306,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
@@ -267,6 +330,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
                         >
@@ -346,6 +414,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',
+                            }"
                             @click.stop="viewNotes($event, pItem.pinyin)"
                             >{{ pItem.pinyin }}</span
                           >
@@ -366,7 +441,11 @@
                               :class="[]"
                               :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',
                               }"
                               @click.stop="viewNotes($event, pItem.words ? pItem.words : pItem.chs)"
@@ -383,6 +462,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',
+                            }"
                             @click.stop="viewNotes($event, pItem.pinyin)"
                             >{{ pItem.pinyin }}</span
                           >
@@ -398,6 +484,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',
+                            }"
                             @click.stop="viewNotes($event, item.sentArr[pIndex + 1].pinyin)"
                             >{{ item.sentArr[pIndex + 1].pinyin }}</span
                           >
@@ -407,7 +500,11 @@
                             :class="[]"
                             :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',
                             }"
                             @click.stop="
@@ -435,6 +532,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',
+                            }"
                             @click.stop="viewNotes($event, item.sentArr[pIndex + 1].pinyin)"
                             >{{ item.sentArr[pIndex + 1].pinyin }}</span
                           >
@@ -457,6 +561,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',
+                            }"
                             @click.stop="viewNotes($event, item.sentArr[pIndex + 2].pinyin)"
                             >{{ item.sentArr[pIndex + 2].pinyin }}</span
                           >
@@ -466,7 +577,11 @@
                             :class="[]"
                             :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',
                             }"
                             @click.stop="
@@ -494,6 +609,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',
+                            }"
                             @click.stop="viewNotes($event, item.sentArr[pIndex + 1].pinyin)"
                             >{{ item.sentArr[pIndex + 2].pinyin }}</span
                           >
@@ -511,6 +633,11 @@
                             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',
+                          }"
                           @click.stop="viewNotes($event, pItem.pinyin)"
                           >{{ pItem.pinyin }}</span
                         >
@@ -531,7 +658,11 @@
                             :class="[]"
                             :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',
                             }"
                             @click.stop="viewNotes($event, pItem.words ? pItem.words : pItem.chs)"
@@ -549,6 +680,11 @@
                             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',
+                          }"
                           @click.stop="viewNotes($event, pItem.pinyin)"
                           >{{ pItem.pinyin }}</span
                         >
@@ -1345,6 +1481,7 @@ export default {
 
     .NNPE-words {
       float: left;
+      padding-bottom: 5px;
 
       &-box {
         float: left;
@@ -1357,7 +1494,7 @@ export default {
             font-family: 'League';
             font-size: 14px;
             font-weight: normal;
-            line-height: 22px;
+            line-height: 1.5;
 
             &.noFont {
               font-family: initial;
@@ -1371,7 +1508,7 @@ export default {
           &.NNPE-chs {
             font-family: '楷体';
             font-size: 20px;
-            line-height: 28px;
+            line-height: 1.4;
 
             &.active {
               color: #de4444;
@@ -1404,7 +1541,7 @@ export default {
           font-family: 'League';
           font-size: 14px;
           font-weight: normal;
-          line-height: 22px;
+          line-height: 1.5;
 
           &.noFont {
             font-family: initial;
@@ -1418,7 +1555,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/article/Practicechs.vue

@@ -119,6 +119,11 @@
                             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>
@@ -143,7 +148,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',
                               width: pItem.chs[wIndex].trim() === '' ? '6px' : '',
                               color:
@@ -167,6 +176,11 @@
                             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>
@@ -181,6 +195,11 @@
                             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>
@@ -197,7 +216,11 @@
                           ]"
                           :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',
                             width: item.sentArr[pIndex + 1].chs.trim() === '' ? '6px' : '',
                             color:
@@ -226,6 +249,11 @@
                             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>
@@ -247,6 +275,11 @@
                             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>
@@ -263,7 +296,11 @@
                           ]"
                           :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',
                             width: item.sentArr[pIndex + 2].chs.trim() === '' ? '6px' : '',
                             color:
@@ -292,6 +329,11 @@
                             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>
@@ -308,6 +350,11 @@
                           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>
@@ -334,7 +381,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',
                             width: pItem.chs[wIndex].trim() === '' ? '6px' : '',
                             color:
@@ -361,6 +412,11 @@
                           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>
@@ -1020,6 +1076,7 @@ export default {
 
     .NNPE-words {
       float: left;
+      padding-bottom: 5px;
 
       &-box {
         float: left;
@@ -1032,7 +1089,7 @@ export default {
             font-family: 'League';
             font-size: 14px;
             font-weight: normal;
-            line-height: 20px;
+            line-height: 1.5;
             color: rgba(0, 0, 0, 45%);
 
             &.noFont {
@@ -1053,7 +1110,7 @@ export default {
             flex-flow: wrap;
             font-family: '楷体';
             font-size: 20px;
-            line-height: 28px;
+            line-height: 1.4;
             color: rgba(0, 0, 0, 45%);
 
             .active {
@@ -1095,7 +1152,7 @@ export default {
           font-family: 'League';
           font-size: 14px;
           font-weight: normal;
-          line-height: 20px;
+          line-height: 1.5;
           color: rgba(0, 0, 0, 45%);
 
           &.noFont {
@@ -1116,7 +1173,7 @@ export default {
           flex-flow: wrap;
           font-family: '楷体';
           font-size: 20px;
-          line-height: 28px;
+          line-height: 1.4;
           color: rgba(0, 0, 0, 45%);
 
           .active {

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

@@ -89,6 +89,13 @@
                             v-if="curQue.property.pinyin_position == 'top' && config.isShowPY && item.dhaspinyin"
                             class="NNPE-pinyin"
                             :class="[pItem.className ? pItem.className : '']"
+                            :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
@@ -109,7 +116,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',
                               backgroundColor:
                                 item.timeList &&
@@ -127,6 +138,13 @@
                             v-if="curQue.property.pinyin_position == 'bottom' && config.isShowPY && item.dhaspinyin"
                             class="NNPE-pinyin"
                             :class="[pItem.className ? pItem.className : '']"
+                            :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>
@@ -135,6 +153,13 @@
                             v-if="curQue.property.pinyin_position == 'top' && config.isShowPY && item.dhaspinyin"
                             class="NNPE-pinyin"
                             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
@@ -151,7 +176,11 @@
                             ]"
                             :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',
                               backgroundColor:
                                 item.timeList &&
@@ -173,6 +202,13 @@
                             v-if="curQue.property.pinyin_position == 'bottom' && config.isShowPY && item.dhaspinyin"
                             class="NNPE-pinyin"
                             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
@@ -216,7 +259,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',
                               backgroundColor:
                                 item.timeList &&
@@ -241,6 +288,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>
@@ -253,6 +307,11 @@
                             pItem.chs != '“' && pItem.padding ? 'padding' : '',
                             pItem.className ? pItem.className : '',
                           ]"
+                          :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
@@ -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',
                             backgroundColor:
                               item.timeList &&
@@ -291,6 +354,11 @@
                             pItem.chs != '“' && pItem.padding ? 'padding' : '',
                             pItem.className ? pItem.className : '',
                           ]"
+                          :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>
@@ -371,6 +439,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>
@@ -388,7 +463,11 @@
                               :class="[]"
                               :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',
                               }"
                               >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.chs[wIndex] : '' }}</span
@@ -404,6 +483,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>
@@ -418,6 +504,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>
@@ -426,7 +519,11 @@
                             :class="[]"
                             :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',
                             }"
                           >
@@ -446,6 +543,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>
@@ -468,6 +572,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>
@@ -476,7 +587,11 @@
                             :class="[]"
                             :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',
                             }"
                           >
@@ -496,6 +611,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>
@@ -512,6 +634,11 @@
                             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>
@@ -529,7 +656,11 @@
                             :class="[]"
                             :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',
                             }"
                             >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.chs[wIndex] : '' }}</span
@@ -546,6 +677,11 @@
                             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>
@@ -1137,6 +1273,7 @@ export default {
 
     .NNPE-words {
       float: left;
+      padding-bottom: 5px;
 
       &-box {
         float: left;
@@ -1149,7 +1286,7 @@ export default {
             font-family: 'League';
             font-size: 14px;
             font-weight: normal;
-            line-height: 22px;
+            line-height: 1.5;
 
             &.noFont {
               font-family: initial;
@@ -1163,7 +1300,7 @@ export default {
           &.NNPE-chs {
             font-family: '楷体';
             font-size: 20px;
-            line-height: 28px;
+            line-height: 1.4;
 
             &.active {
               background: rgba(36, 185, 158, 15%);
@@ -1200,7 +1337,7 @@ export default {
           font-family: 'League';
           font-size: 14px;
           font-weight: normal;
-          line-height: 22px;
+          line-height: 1.5;
 
           &.noFont {
             font-family: initial;
@@ -1214,7 +1351,7 @@ export default {
         &.NNPE-chs {
           font-family: '楷体';
           font-size: 20px;
-          line-height: 28px;
+          line-height: 1.4;
 
           &.active {
             background: rgba(36, 185, 158, 15%);

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

@@ -153,20 +153,11 @@
                           <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>
@@ -471,20 +462,11 @@
                           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>