dsy před 1 týdnem
rodič
revize
7af7a147e4

+ 1 - 1
src/views/book/courseware/data/fill.js

@@ -53,7 +53,7 @@ export function getFillProperty() {
     fill_type: fillTypeList[0].value,
     sn_position: serialNumberPositionList[3].value,
     sn_display_mode: displayList[0].value,
-    arrange_type: arrangeTypeList[0].value,
+    arrange_type: arrangeTypeList[1].value,
     audio_position: audioPositionList[0].value,
     audio_generation_method: audioGenerationMethodList[0].value,
     fill_font: fillFontList[0].value,

+ 3 - 3
src/views/book/courseware/preview/components/article/components/WordPhraseDetail.vue

@@ -215,7 +215,7 @@
               </span> -->
             </div>
             <el-collapse-transition>
-              <div class="liju" v-show="wordShow">
+              <div v-show="wordShow" class="liju">
                 <div v-for="(item, i) in list1" :key="i">
                   <div>{{ i + 1 }}.</div>
                   <div>
@@ -242,7 +242,7 @@
               </span> -->
             </div>
             <el-collapse-transition>
-              <div class="liju" v-show="wordShow2">
+              <div v-show="wordShow2" class="liju">
                 <div v-for="(item, i) in list2" :key="i">
                   <div>{{ list1.length + i + 1 }}.</div>
                   <div>
@@ -268,7 +268,7 @@
               </span> -->
             </div>
             <el-collapse-transition>
-              <div class="liju" v-if="wordShow3">
+              <div v-if="wordShow3" class="liju">
                 <div v-for="(item, i) in list3" :key="i">
                   <div>{{ list1.length + list2.length + i + 1 }}.</div>
                   <div>

+ 19 - 7
src/views/book/courseware/preview/components/new_word/NewWordPreview.vue

@@ -11,7 +11,15 @@
           }" -->
         <div v-if="data.title_con" class="topTitle">
           <div class="NPC-top-left">
-            <span class="NPC-topTitle-text" v-html="data.title_con"></span>
+            <span
+              class="NPC-topTitle-text"
+              v-html="data.title_con"
+              :style="{
+                color:
+                  data.unified_attrib && data.unified_attrib.topic_color ? data.unified_attrib.topic_color : '#de4444',
+                fontSize: data.unified_attrib && data.unified_attrib.font_size ? data.unified_attrib.font_size : '',
+              }"
+            ></span>
             <span v-if="showLang" class="NPC-topTitle-text">
               {{ titleTrans[getLang()] }}
             </span>
@@ -738,7 +746,6 @@ export default {
     writeTableZoom,
   },
   mixins: [PreviewMixin],
-  inject: ['bookInfo'],
   props: ['newData'],
   data() {
     return {
@@ -794,7 +801,7 @@ export default {
   },
   mounted() {
     let totalWidth = document.querySelector('.newWord-preview').offsetWidth;
-    this.width = `${totalWidth - (this.data.property.sn_display_mode === 'true' ? 15 : 0) - (this.newData ? 16 : 0)}px`;
+    this.width = `${totalWidth - (this.data.property.sn_display_mode === 'true' ? 15 : 0)}px`;
   },
   methods: {
     palyAudio(url, sIndex) {
@@ -1803,7 +1810,7 @@ export default {
     display: flex;
     justify-content: space-between;
     width: 100%;
-    height: 48px;
+    height: 40px;
     overflow: hidden;
 
     // background: #e35454;
@@ -1815,12 +1822,17 @@ export default {
       justify-content: flex-start;
 
       .NPC-topTitle-text {
-        margin-right: 8px;
-        font-family: 'sourceR';
+        // margin-right: 8px;
+        // font-family: 'sourceR';
         font-size: 16px;
         font-weight: bold;
-        color: #fff;
+
+        // color: #fff;
         white-space: pre;
+
+        p {
+          margin: 0;
+        }
       }
     }
 

+ 14 - 4
src/views/book/courseware/preview/components/notes/NotesPreview.vue

@@ -11,7 +11,15 @@
           }" -->
         <div class="topTitle-note" v-if="data.title_con">
           <div class="NPC-top-left">
-            <span class="NPC-topTitle-text" v-html="data.title_con"></span>
+            <span
+              class="NPC-topTitle-text"
+              v-html="data.title_con"
+              :style="{
+                color:
+                  data.unified_attrib && data.unified_attrib.topic_color ? data.unified_attrib.topic_color : '#de4444',
+                fontSize: data.unified_attrib && data.unified_attrib.font_size ? data.unified_attrib.font_size : '',
+              }"
+            ></span>
             <span v-if="showLang" class="NPC-topTitle-text">
               {{ titleTrans[getLang()] }}
             </span>
@@ -243,11 +251,13 @@ export default {
         justify-content: flex-start;
 
         .NPC-topTitle-text {
-          margin: 0 8px 0 0;
-          font-family: 'sourceR';
+          // margin: 0 8px 0 0;
+
+          // font-family: 'sourceR';
           font-size: 16px;
           font-weight: bold;
-          color: #fff;
+
+          // color: #fff;
         }
       }
 

+ 16 - 10
src/web_preview/index.vue

@@ -133,7 +133,7 @@
           </div>
         </aside>
         <div class="content">
-          <div class="resource_box">
+          <div v-if="['image', 'audio', 'video'].includes(curToolbarIcon)" class="resource_box">
             <h5>{{ drawerTitle }}</h5>
             <div style="height: 40px"></div>
             <ul
@@ -1132,17 +1132,23 @@ $total-width: $courseware-width + $courseware-left-margin + $courseware-right-ma
     .slider-area {
       column-gap: 8px !important;
     }
-  }
-}
 
-:deep .audit-dialog {
-  .el-dialog__body {
-    height: calc(100vh - 260px);
-    padding: 5px 20px;
-  }
+    :deep .remark-dialog {
+      .el-dialog__body {
+        padding: 5px 20px;
+      }
+    }
 
-  .mind-map-container .mind-map {
-    height: calc(100vh - 310px);
+    :deep .audit-dialog {
+      .el-dialog__body {
+        height: calc(100vh - 260px);
+        padding: 5px 20px;
+      }
+
+      .mind-map-container .mind-map {
+        height: calc(100vh - 310px);
+      }
+    }
   }
 }
 </style>