Bläddra i källkod

板式位置调整

shanbinzhang 4 månader sedan
förälder
incheckning
5a2c480328

+ 16 - 1
src/views/ppt_manage/newVersion/components/formatPage/FormatFourteen.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="total-wrap" :style="{'pointer-events' :isPreview?'none':'auto'}">
+  <div class="total-wrap format-fourteen" :style="{'pointer-events' :isPreview?'none':'auto'}">
       <div class="wrap-full-left-half top flex-center" :style="pageItem.layers&&!isLayerShow()?TypeName(1)==='ChartEl'?'z-index:5':'z-index:3':''">
         <component
           :data-position="1"
@@ -90,4 +90,19 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.format-fourteen {
+  .wrap-full-left-half{
+    width: 40%;
+    &.top {
+      height: 65%;
+    }
+    &.bottom {
+      height: 35%;
+      top: 65%;
+    }
+  }
+  .fourteen-right {
+    width: 60%;
+  }
+}
 </style>

+ 2 - 1
src/views/ppt_manage/newVersion/components/formatPreview/FormatPreFourteen.vue

@@ -2,7 +2,8 @@
   <div class="format-pre-wrap flex-center">
     <div class="half-left flex-center">
       <img class="half-top" src="~@/assets/img/ppt_m/format-pic.png" />
-      <img class="half-bottom" src="~@/assets/img/ppt_m/format-pic.png" />
+      <!-- <img class="half-bottom" src="~@/assets/img/ppt_m/format-pic.png" /> -->
+      <div class="half-bottom text"></div>
     </div>
     <div class="half-right flex-center">
       <div class="full text"></div>

+ 7 - 7
src/views/ppt_manage/newVersion/utils/config.js

@@ -557,21 +557,21 @@ export const modelConfig = [{
       modelId: 14,
       elements: [{
           position: 1,
-          width: 100*0.5,
-          height: (restHeight)*0.5*0.84,
+          width: 100*0.4,
+          height: (restHeight)*0.65*0.84,
           x: 0,
           y: ((restHeight)*0.5-(restHeight)*0.5*0.84)/2
       }, {
           position: 2,
-          width: 100*0.5,
-          height: (restHeight)*0.5*0.84,
+          width: 100*0.4,
+          height: (restHeight)*0.35*0.84,
           x: 0,
-          y: 50-7/* +((restHeight)*0.5-(restHeight)*0.5*0.84)/2 */,//or 50
+          y: 52/* +((restHeight)*0.5-(restHeight)*0.5*0.84)/2 */,//or 50
       }, {
           position: 3,
-          width: 100*0.5,
+          width: 100*0.6,
           height: (restHeight)*0.9,
-          x: 50,
+          x: 40,
           y: ((restHeight)-(restHeight)*0.9)/2
       }]
   },

+ 5 - 5
src/views/ppt_manage/newVersion/utils/untils.js

@@ -360,9 +360,9 @@ export const getTextContentSize = (model,position)=>{
             1:[],2:[]
         },
         14: {
-          1:[1,0.5,1,0.9],
-          2:[1,0.5,1,0.9],
-          3:[1,0.5,1,0.9]
+          1:[1,0.4,1,0.9],
+          2:[1,0.4,1,0.9],
+          3:[1,0.6,1,0.9]
         }
     }
     const modelMapHeight = {
@@ -422,8 +422,8 @@ export const getTextContentSize = (model,position)=>{
             1:[],2:[]
         },
         14: {
-            1:[0.86,1,0.5,0.84],
-            2:[0.86,1,0.5,0.84],
+            1:[0.86,1,0.65,0.84],
+            2:[0.86,1,0.35,0.84],
             3:[0.86,1,0.9]
         }
     }