预览修改

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

@@ -435,7 +435,7 @@ export default {
           })
             .then((res) => {
               window.open(
-                `${ress.text_analyser_page_address}GCLS-TC/#/textanalysis/Result?id=${res.record.id}&type=文本分析&AccessToken=${access_token}`,
+                `${ress.text_analyser_page_address}GCLS-TC/#/textanalysis/Result?id=${res.record.id}&type=文本分析&AccessToken=${access_token}&fromEEP=true`,
               );
               loading.close();
             })

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

@@ -94,10 +94,37 @@
                 :style="{
                   fontSize: curQue.property.notice_size ? curQue.property.notice_size + 'px' : '',
                   color: curQue.property.notice_color ? curQue.property.notice_color : '',
+                  fontFamily: curQue.property.noitce_family ? curQue.property.noitce_family : '',
                 }"
+                v-if="item.noticeWordList.length === 0"
               >
                 {{ convertText(item.notice) }}
               </p>
+              <p
+                :class="['notice']"
+                :style="{
+                  fontSize: curQue.property.notice_size ? curQue.property.notice_size + 'px' : '',
+                  color: curQue.property.notice_color ? curQue.property.notice_color : '',
+                  fontFamily: curQue.property.noitce_family ? curQue.property.noitce_family : '',
+                }"
+                v-else
+              >
+                <span v-for="(items, indexs) in item.noticeWordList" :key="indexs">
+                  <span
+                    v-for="(pItem, indexss) in items"
+                    :key="indexss"
+                    :style="{
+                      fontFamily: pItem.fontFamily,
+                      textDecoration: pItem.textDecoration,
+                      borderBottom: pItem.border === 'dotted' ? '1px dotted' : '',
+                      fontWeight: pItem.fontWeight,
+                      color: pItem.color,
+                    }"
+                  >
+                    {{ convertText(pItem.chs) }}
+                  </span>
+                </span>
+              </p>
             </template>
             <template v-else>
               <RoleChs :cur-role="item.roleDetail" :type="curQue.property.role_img_type" />
@@ -1034,6 +1061,9 @@ export default {
         let startLeg = dIndex === 0 ? 0 : curQue.detail[dIndex - 1].endLeg;
         let endLeg = startLeg + curSentencesLeg;
         dItem.endLeg = endLeg;
+        if (dItem.type === 'notice') {
+          dItem.endLeg = dIndex === 0 ? 0 : curQue.detail[dIndex - 1].endLeg;
+        }
         let timeList = [];
         if (curQue.wordTime && curQue.wordTime.length > 0 && dItem.type === 'text') {
           timeList = curQue.wordTime.slice(startLeg, endLeg);
@@ -1049,7 +1079,9 @@ export default {
           dhaspinyin,
           type: dItem.type,
           notice: dItem.notice,
+          noticeWordList: dItem.noticeWordList,
           notice_size: dItem.notice_size,
+          noitce_family: dItem.noitce_family,
           notice_color: dItem.notice_color,
           file_url_open: dItem.file_url_open,
         };

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

@@ -85,10 +85,37 @@
                 :style="{
                   fontSize: curQue.property.notice_size ? curQue.property.notice_size + 'px' : '',
                   color: curQue.property.notice_color ? curQue.property.notice_color : '',
+                  fontFamily: curQue.property.noitce_family ? curQue.property.noitce_family : '',
                 }"
+                v-if="item.noticeWordList.length === 0"
               >
                 {{ convertText(item.notice) }}
               </p>
+              <p
+                :class="['notice']"
+                :style="{
+                  fontSize: curQue.property.notice_size ? curQue.property.notice_size + 'px' : '',
+                  color: curQue.property.notice_color ? curQue.property.notice_color : '',
+                  fontFamily: curQue.property.noitce_family ? curQue.property.noitce_family : '',
+                }"
+                v-else
+              >
+                <span v-for="(items, indexs) in item.noticeWordList" :key="indexs">
+                  <span
+                    v-for="(pItem, indexss) in items"
+                    :key="indexss"
+                    :style="{
+                      fontFamily: pItem.fontFamily,
+                      textDecoration: pItem.textDecoration,
+                      borderBottom: pItem.border === 'dotted' ? '1px dotted' : '',
+                      fontWeight: pItem.fontWeight,
+                      color: pItem.color,
+                    }"
+                  >
+                    {{ convertText(pItem.chs) }}
+                  </span>
+                </span>
+              </p>
             </template>
             <template v-else>
               <RoleChs :cur-role="item.roleDetail" :type="curQue.property.role_img_type" />
@@ -911,6 +938,9 @@ export default {
         let startLeg = dIndex === 0 ? 0 : curQue.detail[dIndex - 1].endLeg;
         let endLeg = startLeg + curSentencesLeg;
         dItem.endLeg = endLeg;
+        if (dItem.type === 'notice') {
+          dItem.endLeg = dIndex === 0 ? 0 : curQue.detail[dIndex - 1].endLeg;
+        }
         let timeList = [];
         if (curQue.wordTime && curQue.wordTime.length > 0 && dItem.type === 'text') {
           timeList = curQue.wordTime.slice(startLeg, endLeg);
@@ -926,7 +956,9 @@ export default {
           dhaspinyin,
           type: dItem.type,
           notice: dItem.notice,
+          noticeWordList: dItem.noticeWordList,
           notice_size: dItem.notice_size,
+          noitce_family: dItem.noitce_family,
           notice_color: dItem.notice_color,
           file_url_open: dItem.file_url_open,
         };

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

@@ -80,6 +80,7 @@
           :style="{
             fontSize: curQue.property.notice_size ? curQue.property.notice_size + 'px' : '',
             color: curQue.property.notice_color ? curQue.property.notice_color : '',
+            fontFamily: curQue.property.noitce_family ? curQue.property.noitce_family : '',
           }"
         >
           {{ convertText(curQue.notice) }}
@@ -1106,7 +1107,9 @@ export default {
             dhaspinyin,
             type: dItem.type,
             notice: dItem.notice,
+            noticeWordList: dItem.noticeWordList,
             notice_size: dItem.notice_size,
+            noitce_family: dItem.noitce_family,
             notice_color: dItem.notice_color,
             file_url_open: dItem.file_url_open,
           };

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

@@ -84,10 +84,37 @@
                 :style="{
                   fontSize: curQue.property.notice_size ? curQue.property.notice_size + 'px' : '',
                   color: curQue.property.notice_color ? curQue.property.notice_color : '',
+                  fontFamily: curQue.property.noitce_family ? curQue.property.noitce_family : '',
                 }"
+                v-if="item.noticeWordList.length === 0"
               >
                 {{ convertText(item.notice) }}
               </p>
+              <p
+                :class="['notice']"
+                :style="{
+                  fontSize: curQue.property.notice_size ? curQue.property.notice_size + 'px' : '',
+                  color: curQue.property.notice_color ? curQue.property.notice_color : '',
+                  fontFamily: curQue.property.noitce_family ? curQue.property.noitce_family : '',
+                }"
+                v-else
+              >
+                <span v-for="(items, indexs) in item.noticeWordList" :key="indexs">
+                  <span
+                    v-for="(pItem, indexss) in items"
+                    :key="indexss"
+                    :style="{
+                      fontFamily: pItem.fontFamily,
+                      textDecoration: pItem.textDecoration,
+                      borderBottom: pItem.border === 'dotted' ? '1px dotted' : '',
+                      fontWeight: pItem.fontWeight,
+                      color: pItem.color,
+                    }"
+                  >
+                    {{ convertText(pItem.chs) }}
+                  </span>
+                </span>
+              </p>
             </template>
             <template v-else>
               <RoleChs :cur-role="item.roleDetail" :type="curQue.property.role_img_type" />
@@ -806,6 +833,9 @@ export default {
         let startLeg = dIndex === 0 ? 0 : curQue.detail[dIndex - 1].endLeg;
         let endLeg = startLeg + curSentencesLeg;
         dItem.endLeg = endLeg;
+        if (dItem.type === 'notice') {
+          dItem.endLeg = dIndex === 0 ? 0 : curQue.detail[dIndex - 1].endLeg;
+        }
         let timeList = curQue.wordTime.slice(startLeg, endLeg);
         let enwords =
           dItem.sentencesEn && dItem.sentencesEn.length > 0 ? dItem.sentencesEn.join(' ').replace(/'/g, '’') : '';
@@ -818,7 +848,9 @@ export default {
           dhaspinyin,
           type: dItem.type,
           notice: dItem.notice,
+          noticeWordList: dItem.noticeWordList,
           notice_size: dItem.notice_size,
+          noitce_family: dItem.noitce_family,
           notice_color: dItem.notice_color,
           file_url_open: dItem.file_url_open,
         };

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

@@ -429,7 +429,7 @@ export default {
           })
             .then((res) => {
               window.open(
-                `${ress.text_analyser_page_address}GCLS-TC/#/textanalysis/Result?id=${res.record.id}&type=文本分析&AccessToken=${access_token}`,
+                `${ress.text_analyser_page_address}GCLS-TC/#/textanalysis/Result?id=${res.record.id}&type=文本分析&AccessToken=${access_token}&fromEEP=true`,
               );
               loading.close();
             })

src/views/book/courseware/preview/components/fill/FillPreview.vue

@@ -31,7 +31,7 @@
                   v-model="li.content"
                   :disabled="disabled"
                   :class="[data.property.fill_font, ...computedAnswerClass(li.mark)]"
-                  :style="[{ width: Math.max(80, li.content.length * 21.3) + 'px' }]"
+                  :style="[{ width: Math.max(data.property.input_default_width, li.content.length * 21.3) + 'px' }]"
                 />
               </template>
 
@@ -54,7 +54,7 @@
                     :readonly="true"
                     :class="[data.property.fill_font, ...computedAnswerClass(li.mark)]"
                     class="pinyin"
-                    :style="[{ width: Math.max(80, li.content.length * 21.3) + 'px' }]"
+                    :style="[{ width: Math.max(data.property.input_default_width, li.content.length * 21.3) + 'px' }]"
                   />
                 </el-popover>
               </template>
@@ -443,7 +443,7 @@ export default {
       display: inline-flex;
       align-items: center;
       width: 120px;
-      margin: 0 2px;
+      margin: 0 10px;
       vertical-align: bottom;
 
       &.pinyin :deep input.el-input__inner {