Merge branch 'ppt-page-img-fix'

src/views/ppt_manage/newVersion/components/catalog/pptContent.vue

@@ -319,8 +319,8 @@ export default {
     .ppt-item{
       position:relative;
       width:100%;
-      background: url('~@/assets/img/pptnextimg.png') no-repeat center;
-      background-size: 100%;
+      background: url('~@/assets/img/pptnextimg.png') no-repeat top;
+      background-size: 100% 100%;
       margin-bottom: 20px;
       border: 4px solid transparent;
       .ppt-info{

src/views/ppt_manage/newVersion/components/catalog/pptContentEn.vue

@@ -315,9 +315,9 @@ export default {
     .ppt-item{
       position:relative;
       width:100%;
-      background: url('~@/assets/img/ppt_en_bg.png') no-repeat center;
+      background: url('~@/assets/img/ppt_en_bg.png') no-repeat top;
       /* background-size: cover; */
-      background-size: 100% 104.5%;
+      background-size: 100% 100%;
       margin-bottom: 20px;
       border: 4px solid transparent;
       // .ppt-info{

src/views/ppt_manage/newVersion/components/editor/ChooseCover.vue

@@ -5,7 +5,7 @@
                 <span>选择封面</span>
                 <img src="~@/assets/img/ppt_m/close.png" alt="" class="close_ico" @click="closeDialog">
             </header>
-            <div class="dialog-bg" :style="'backgroundImage:url('+bgList[bgListIndex]+');backgroundPosition:center;backgroundRepeat:no-repeat;backgroundSize:cover;'">
+            <div class="dialog-bg" :style="'backgroundImage:url('+bgList[bgListIndex]+');backgroundPosition:center;backgroundRepeat:no-repeat;'">
                 <div :style="`width:62%; font-size:16px; text-align:center; line-height:1.6; color:${$parent.pptCoverTextColor}; position:absolute; right:20px; top:50%;`">
                     <p :style="`height:5px;margin-bottom:21px;`"></p>
                     <el-input
@@ -214,7 +214,7 @@ export default {
             /* height: 645px; */
             position: relative;
             padding-bottom: 70%;
-            background-size: 100% 100%;
+            background-size: 100% 100% !important;
             .select_ico {
                 width: 48px;
                 height: 48px;

src/views/ppt_manage/newVersion/pptEditor.vue

@@ -1315,6 +1315,7 @@ $titleColor:#333333;
                 display: flex;
                 justify-content: center;
                 align-items: center;
+                background-size: 100% 100% !important;
                 /* background: no-repeat center/cover url(~@/assets/img/ppt_m/bg3.jpg); */
             }
         }
@@ -1383,8 +1384,8 @@ $titleColor:#333333;
                     width:calc(100% - 64px);
                     /* height: 0;
                     padding-bottom: calc(69.408% - 64px); */
-                    background: url('~@/assets/img/pptnextimg.png') no-repeat center;
-                    background-size: cover;
+                    background: url('~@/assets/img/pptnextimg.png') no-repeat top;
+                    background-size: 100% 100%;
                     /* margin-bottom: 30px; */
                     position: relative;
                     border: 4px solid transparent;

src/views/ppt_manage/newVersion/pptEnEditor.vue

@@ -1280,6 +1280,7 @@ $titleColor:#333333;
                 display: flex;
                 justify-content: center;
                 align-items: center;
+                background-size: 100% 100% !important;
                 /* background: no-repeat center/cover url(~@/assets/img/ppt_m/bg3.jpg); */
             }
         }
@@ -1348,9 +1349,9 @@ $titleColor:#333333;
                     width:calc(100% - 64px);
                     /* height: 0;
                     padding-bottom: calc(69.408% - 64px); */
-                    background: url('~@/assets/img/ppt_en_bg.png') no-repeat center;
+                    background: url('~@/assets/img/ppt_en_bg.png') no-repeat top;
                     /* background-size: 898px 642px; */
-                    background-size:101% 104.5%;
+                    background-size:100% 100%;
                     /* margin-bottom: 30px; */
                     position: relative;
                     border: 4px solid transparent;

src/views/ppt_manage/newVersion/pptEnPresent.vue

@@ -862,8 +862,8 @@ $titleColor:#333333;
     .ppt-item{
       width: 100%;
       height: 100%;
-      background: url('~@/assets/img/ppt_en_bg.png') no-repeat center;
-      background-size: 100% 104.5%;
+      background: url('~@/assets/img/ppt_en_bg.png') no-repeat top;
+      background-size: 100% 100%;
       position:relative;
       border: 4px solid transparent;
       overflow: hidden;

src/views/ppt_manage/newVersion/pptEnPublish.vue

@@ -692,8 +692,8 @@ $titleColor:#333333;
       /* height: 628.594px; */
       background-color: pink;
       margin-bottom: 20px;
-      background: url('~@/assets/img/ppt_en_bg.png') no-repeat center;
-      background-size: 100% 104.5%;
+      background: url('~@/assets/img/ppt_en_bg.png') no-repeat top;
+      background-size: 100% 100%;
       position:relative;
       border: 4px solid transparent;
       transform-origin: 0 0;

src/views/ppt_manage/newVersion/utils/config.js

@@ -405,9 +405,9 @@ export const pptSlideMasterEn = {
 		{
 			image: {
         x: 0,
-        y: -0.1,
+        y: 0,
         w: 10,
-        h: 7.1,
+        h: 7,
         path: "/static/ppt_en_bg.png", 
       },
 		},

src/views/ppt_manage/newVersion/utils/untils.js

@@ -50,9 +50,8 @@ export const pptInit = (pptx,LayoutType,lang='ch') => {
     let layout = pptLayout,sliderMaster = lang==='ch'?pptSlideMaster:pptSlideMasterEn
     if(LayoutType!==1){
         layout = { name: "myppt", width: 10, height: LayoutType===2?5.625:7.5 }
-        const y = lang==='ch'?0:-0.1
         const h = LayoutType===2?5.625:7.5
-        sliderMaster.objects[1] = {image: {x:0,y:y,w:10,h:lang==='ch'?h:h+0.1,path: lang==='ch'?"/static/pptnextimg.png":"/static/ppt_en_bg.png"}}
+        sliderMaster.objects[1] = {image: {x:0,y:0,w:10,h,path: lang==='ch'?"/static/pptnextimg.png":"/static/ppt_en_bg.png"}}
         sliderMaster.slideNumber = {x:'95%',y:LayoutType===2?'92%':'95%',fontSize:12}
     }
   pptx.defineLayout(layout)