natasha 1 vuosi sitten
vanhempi
commit
6ec27fcb83

+ 1 - 1
package.json

@@ -37,7 +37,7 @@
     "view-design": "^4.5.0",
     "vue": "2.6.10",
     "vue-element-utils": "^0.2.1",
-    "vue-esign": "^1.0.5",
+    "vue-esign": "^1.1.4",
     "vue-i18n": "^8.24.4",
     "vue-pdf": "^4.2.0",
     "vue-router": "3.0.6",

+ 2 - 2
src/components/Adult/Preview.vue

@@ -1103,7 +1103,7 @@ export default {
   },
   // 生命周期 - 创建完成(可以访问当前this实例)
   created() {
-    console.log("2023-10-08");
+    console.log("2023-10-20");
   },
   // 生命周期 - 挂载完成(可以访问DOM元素)
   mounted() {
@@ -1266,7 +1266,7 @@ export default {
                     this.previewGroupId.indexOf(item.group_id[0]) > -1)||
                     !this.previewType
                 ) {
-                    if(itemss.type!='article_nnpe'&&itemss.type!='dialogue_article_chs'&&itemss.type!='notes_chs'&&itemss.type!='voice_matrix'&&itemss.type!='upload_control_chs'&&itemss.type!='upload_control_preview_chs'&&itemss.type!='record_control_mini'&&itemss.type!='record_control_normal'&&itemss.type!='record_control_pro'&&itemss.type!='record_control_promax'&&itemss.type!='text_problem_chs'&&itemss.type!='newWord_preview_chs'&&itemss.type!='CourseStart_chs'&&itemss.type!='tinydemo_chs'&&itemss.type!='video_chs'&&itemss.type!='play_record_chs'&&itemss.type!='upload_pdf_chs'&&itemss.type!='options_list_chs'&&itemss.type!='sentence_listen_read_chs'&&itemss.type!='imgage_image'){
+                    if(itemss.type!='article_chs'&&itemss.type!='NewWord_chs'&&itemss.type!='dialogue_article_chs'&&itemss.type!='notes_chs'&&itemss.type!='voice_matrix'&&itemss.type!='upload_control_chs'&&itemss.type!='upload_control_preview_chs'&&itemss.type!='record_control_mini'&&itemss.type!='record_control_normal'&&itemss.type!='record_control_pro'&&itemss.type!='record_control_promax'&&itemss.type!='text_problem_chs'&&itemss.type!='newWord_preview_chs'&&itemss.type!='CourseStart_chs'&&itemss.type!='tinydemo_chs'&&itemss.type!='video_chs'&&itemss.type!='play_record_chs'&&itemss.type!='upload_pdf_chs'&&itemss.type!='options_list_chs'&&itemss.type!='sentence_listen_read_chs'&&itemss.type!='imgage_image'){
                         item.showSubmit = true
                     }
                 } 

+ 2 - 1
src/components/Adult/preview/PreviewDialogueNPC.vue

@@ -1332,7 +1332,7 @@ export default {
 <style lang="scss" scoped>
 //@import url(); 引入公共css类
 .NPC-Big-Book-preview {
-  width: 860px;
+  width: 880px;
   margin: 0 auto;
   position: relative;
   padding-bottom: 120px;
@@ -1494,6 +1494,7 @@ export default {
   }
   .NNPE-Book-content-inner {
     padding: 0 40px;
+    width: 860px;
     .NNPE-Book-content-item {
       position: relative;
     }

+ 12 - 10
src/components/Adult/preview/SentenceModule.vue

@@ -58,7 +58,7 @@
         v-if="judgeAnswer == 'standardAnswer'"
         :class="['container', curQue.sortType == 'row' ? 'ul-flex' : '']"
       >
-        <div :class="['sent-option li-flex sent-option-standardAnswer']">
+        <div :class="['sent-option li-flex sent-option-standardAnswer',itemsWidth == 780 ?'hasPadding':'']">
           <div
             :class="[
               'sent-option-items',
@@ -70,7 +70,7 @@
               width:
                 curQue.sortType == 'col'
                   ? itemsWidth + 'px'
-                  : Math.floor(780 / curQue.option.length) - 18 + 'px',
+                  : Math.floor(732 / curQue.option.length) - 16 + 'px',
             }"
           >
             <div
@@ -442,6 +442,7 @@
               ? 'sent-option-24'
               : '',
             curQue.sortType == 'row' ? 'sent-option-row' : 'li-flex',
+            itemsWidth == 780 ?'hasPadding':''
           ]"
           v-for="(item, index) in curQue.option"
           :key="'sent-option' + index"
@@ -1211,17 +1212,16 @@ export default {
       }
 
       this.$set(this.curQue, "option", option);
-      let contentWidth = 732;
+      let contentWidth = 780;
       if (this.curQue.img_list && this.curQue.img_list.length > 0) {
-        contentWidth = 732 - this.curQue.img_size;
+        contentWidth = 780 - this.curQue.img_size;
       }
       if(itemLeg==1){
-        this.itemsWidth = 732
+        this.itemsWidth = 780
       }else{
-        this.itemsWidth = Math.floor(contentWidth / itemLeg) - 18;
+        this.itemsWidth = Math.floor(contentWidth / itemLeg) - 16;
       }
       
-
       // 把答错的挑出来
       if (this.judgeAnswer == "standardAnswer") {
         this.userErrorList = [];
@@ -1436,7 +1436,7 @@ export default {
       if (this.curQue.img_list && this.curQue.img_list.length > 0) {
         contentWidth = 732 - this.curQue.img_size;
       }
-      this.itemsWidth = Math.floor(contentWidth / itemLeg) -18;
+      this.itemsWidth = Math.floor(contentWidth / itemLeg);
     },
     //词和标点合一起
     mergeWordSymbol(sItem) {
@@ -1521,7 +1521,7 @@ export default {
             margin: 8px 0; // 单列左右间距去掉
           }
           &-8 {
-            margin-left: 8px;
+            margin-left: 7px;
             margin-right: 8px;
           }
         }
@@ -1703,7 +1703,9 @@ export default {
   }
   &.hasmp3 {
     .sent-option {
-      padding: 0px 16px;
+        &.hasPadding{
+            padding: 0px 16px;
+        }
     }
     &.sentence-control {
       background: #f7f7f7;

+ 3 - 1
src/components/Adult/preview/components/Freewrite.vue

@@ -8,7 +8,7 @@
         "
         class="character-target-div"
       >
-        <FreeWriteQP
+        <vueEsign
           :bgColor.sync="bgColor"
           :height="height"
           :isCrop="isCrop"
@@ -65,11 +65,13 @@
 </template>
 
 <script>
+import vueEsign from "vue-esign";
 import FreeWriteQP from "./FreeWriteQP.vue";
 import { LearnWebSI } from "../../../../api/ajax";
 export default {
   components: {
     FreeWriteQP,
+    vueEsign
   },
   props: [
     "lineColor",

+ 3 - 1
src/components/Adult/preview/components/FreewriteLettle.vue

@@ -19,7 +19,7 @@
         <template v-if="!hasPlay && data && data.strokes_image_url">
           <img class="img" :src="data.strokes_image_url" alt="" />
         </template>
-        <FreeWriteQP
+        <vueEsign
           :bgColor.sync="bgColor"
           :height="height"
           :isCrop="isCrop"
@@ -55,6 +55,7 @@
 </template>
 
 <script>
+import vueEsign from "vue-esign";
 import Strockplayredline from "./Strockplayredline.vue";
 import Strockred from "./Strockred.vue";
 import FreeWriteQP from "./FreeWriteQP.vue";
@@ -69,6 +70,7 @@ export default {
     FreeWriteQP,
     // ChinaDict,
     // Audio,
+    vueEsign
   },
   props: [
     "cur",