cxmo 1 жил өмнө
parent
commit
38e4d1291e

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

@@ -228,15 +228,15 @@ export const modelConfig = [{
         modelId: 2,
         elements: [{
             position: 1,
-            width: 100*0.6*0.9, 
+            width: 100*0.6, 
             height:(restHeight)*0.8 ,
-            x: (100*0.6-100*0.6*0.9)/2,
+            x: 0,
             y: ((restHeight)-(restHeight)*0.8)/2
         }, {
             position: 2,
-            width: 100*0.4*0.9, 
+            width: 100*0.4, 
             height: (restHeight)*0.8,
-            x: 60+(100*0.4-100*0.4*0.9)/2,// or 60
+            x: 60,// or 60
             y: ((restHeight)-(restHeight)*0.8)/2
         }]
     },
@@ -244,20 +244,20 @@ export const modelConfig = [{
         modelId: 3,
         elements: [{
             position: 1,
-            width: 100*0.5*0.9,
+            width: 100*0.5,
             height: (restHeight)*0.5*0.84,
-            x: (100*0.5-100*0.5*0.9)/2,
+            x: 0,
             y: ((restHeight)*0.5-(restHeight)*0.5*0.84)/2
         }, {
             position: 2,
-            width: 100*0.5*0.9,
+            width: 100*0.5,
             height: (restHeight)*0.5*0.84,
-            x: (100*0.5-100*0.5*0.9)/2,
+            x: 0,
             //这个位置的图表布局是align-items: flex-start,所以紧接着上一个图表
             y: 50-7/* +((restHeight)*0.5-(restHeight)*0.5*0.84)/2 */,//or 50
         }, {
             position: 3,
-            width: 100*0.5*0.9,
+            width: 100*0.5,
             height: (restHeight)*0.84,
             x: 50,
             y: ((restHeight)-(restHeight)*0.84)/2
@@ -267,27 +267,27 @@ export const modelConfig = [{
         modelId: 4,
         elements: [{
             position: 1,
-            width: 100*0.5*0.9,
+            width: 100*0.5,
             height: (restHeight)*0.5*0.84,
-            x: (100*0.5-100*0.5*0.9)/2,
+            x: 0,
             y: ((restHeight)*0.5-(restHeight)*0.5*0.84)/2
         }, {
             position: 2,
-            width: 100*0.5*0.9,
+            width: 100*0.5,
             height: (restHeight)*0.5*0.84,
-            x: (100*0.5-100*0.5*0.9)/2,
+            x: 0,
             y: 50-7/* +((restHeight)*0.5-(restHeight)*0.5*0.84)/2 */,//or 50
         }, {
             position: 3,
-            width: 100*0.5*0.9,
+            width: 100*0.5,
             height: (restHeight)*0.5*0.84,
-            x: 50+(100*0.5-100*0.5*0.9)/2,//or 50
+            x: 50,//or 50
             y: ((restHeight)*0.5-(restHeight)*0.5*0.84)/2
         }, {
             position: 4,
-            width: 100*0.5*0.9,
+            width: 100*0.5,
             height: (restHeight)*0.5*0.84,
-            x: 50+(100*0.5-100*0.5*0.9)/2,
+            x: 50,
             y: 50-7/* +((restHeight)*0.5-(restHeight)*0.5*0.84)/2 */,//or 50
         }]
     },
@@ -295,27 +295,27 @@ export const modelConfig = [{
         modelId: 5,
         elements: [{
             position: 1,
-            width: 100*0.5*0.9,
+            width: 100*0.5,
             height: (restHeight)*0.5*0.84,
-            x: (100*0.5-100*0.5*0.9)/2,
+            x: 0,
             y: ((restHeight)*0.5-(restHeight)*0.5*0.84)/2
         }, {
             position: 2,
-            width: 100*0.5*0.9,
+            width: 100*0.5,
             height: (restHeight)*0.5*0.84,
-            x: (100*0.5-100*0.5*0.9)/2,
+            x: 0,
             y: 50-7/* +((restHeight)*0.5-(restHeight)*0.5*0.84)/2 */,//or 50
         }, {
             position: 3,
-            width: 100*0.5*0.9,
+            width: 100*0.5,
             height: (restHeight)*0.5*0.84,
-            x: 50+(100*0.5-100*0.5*0.9)/2,//or 50
+            x: 50,//or 50
             y: ((restHeight)*0.5-(restHeight)*0.5*0.84)/2
         }, {
             position: 4,
-            width: 100*0.5*0.9,
+            width: 100*0.5,
             height: (restHeight)*0.5*0.84,
-            x: 50+(100*0.5-100*0.5*0.9)/2,
+            x: 50,
             y: 50-7/* +((restHeight)*0.5-(restHeight)*0.5*0.84)/2 */,//or 50
         }]
     },
@@ -333,15 +333,15 @@ export const modelConfig = [{
         modelId:7,
         elements:[{
             position:1,
-            width:100*0.5*0.9,
+            width:100*0.5,
             height:(restHeight)*0.8,
-            x:(100*0.5 - 100*0.5*0.9)/2,
+            x:0,
             y:((restHeight)-(restHeight)*0.8)/2
         },{
             position:2,
-            width:100*0.5*0.9,
+            width:100*0.5,
             height:(restHeight)*0.8,
-            x:50+(100*0.5 - 100*0.5*0.9)/2,
+            x:50,
             y:((restHeight)-(restHeight)*0.8)/2
         }]
     },
@@ -349,16 +349,16 @@ export const modelConfig = [{
       modelId:8,
       elements:[{
         position:1,
-        width:100*0.9,
+        width:100,
         height:(restHeight)*0.7*0.9,
-        x:(100-100*0.9)/2,
+        x:0,
         y:(restHeight*0.7-restHeight*0.7*0.9)/2
       },
       {
         position:2,
-        width:100*0.9,
+        width:100,
         height:(restHeight)*0.3*0.8,
-        x:(100-100*0.9)/2,
+        x:0,
         y:60
       }]
     },
@@ -366,23 +366,23 @@ export const modelConfig = [{
       modelId:9,
       elements:[{
         position:1,
-        width:100*0.5*0.9,
+        width:100*0.5,
         height:(restHeight)*0.7*0.9,
-        x:(100*0.5-100*0.5*0.9)/2,
+        x:0,
         y:(restHeight*0.7-restHeight*0.7*0.9)/2
       },
       {
         position:2,
-        width:100*0.5*0.9,
+        width:100*0.5,
         height:(restHeight)*0.7*0.9,
-        x:50+(100*0.5-100*0.5*0.9)/2,
+        x:50,
         y:(restHeight*0.7-restHeight*0.7*0.9)/2
       },
       {
         position:3,
         width:100*0.9,
         height:(restHeight)*0.3*0.8,
-        x:(100-100*0.9)/2,
+        x:0,
         y:60
       }
     ]
@@ -390,126 +390,126 @@ export const modelConfig = [{
         modelId:12,
         elements:[{
             position:1,
-            width:33*0.9,
+            width:33,
             height:(restHeight)*0.48*0.9,
-            x:(33*0.1)/2,
+            x:0,
             y:(restHeight*0.48*0.1)/2
         },{
             position:2,
-            width:33*0.9,
+            width:33,
             height:(restHeight)*0.48*0.9,
-            x:(33*0.1)/2+33,
+            x:33,
             y:(restHeight*0.48*0.1)/2
         },
         {
             position:3,
-            width:33*0.9,
+            width:33,
             height:(restHeight)*0.48*0.9,
-            x:(33*0.1)/2+33*2,
+            x:33*2,
             y:(restHeight*0.48*0.1)/2
         },
         {
             position:4,
-            width:33*0.9,
+            width:33,
             height:(restHeight)*0.48*0.9,
-            x:(33*0.1)/2,
+            x:0,
             y:(restHeight)*0.48
         },
         {
             position:5,
-            width:33*0.9,
+            width:33,
             height:(restHeight)*0.48*0.9,
-            x:(33*0.1)/2+33,
+            x:33,
             y:(restHeight)*0.48
         },
         {
             position:6,
-            width:33*0.9,
+            width:33,
             height:(restHeight)*0.48*0.9,
-            x:(33*0.1)/2+33*2,
+            x:33*2,
             y:(restHeight)*0.48
         }]
     },{
         modelId:11,
         elements:[{
             position:1,
-            width:45*0.9,
+            width:50,
             height:(restHeight)*0.40*0.9,
-            x:(45*0.1)/2,
+            x:0,
             y:(restHeight*0.4*0.1)/2
         },{
             position:2,
-            width:45*0.9,
+            width:50,
             height:(restHeight)*0.40*0.9,
-            x:(45*0.1)/2+50,
+            x:50,
             y:(restHeight*0.4*0.1)/2
         },{
             position:3,
-            width:45*0.9,
+            width:50,
             height:(restHeight)*0.40*0.9,
-            x:(45*0.1)/2,
+            x:0,
             y:38
         },{
             position:4,
-            width:45*0.9,
+            width:50,
             height:(restHeight)*0.40*0.9,
-            x:(45*0.1)/2+50,
+            x:50,
             y:38
         },{
             position:5,
             width:100*0.9,
             height:(restHeight)*0.18*0.8,
-            x:(100-100*0.9)/2,
+            x:0,
             y:74
         }]
     },{
         modelId:10,
         elements:[{
             position:1,
-            width:33*0.9,
+            width:33,
             height:(restHeight)*0.4*0.9,
-            x:(33*0.1)/2,
+            x:0,
             y:(restHeight*0.4*0.1)/2
         },{
             position:2,
-            width:33*0.9,
+            width:33,
             height:(restHeight)*0.4*0.9,
-            x:(33*0.1)/2+33,
+            x:33,
             y:(restHeight*0.4*0.1)/2
         },
         {
             position:3,
-            width:33*0.9,
+            width:33,
             height:(restHeight)*0.4*0.9,
-            x:(33*0.1)/2+33*2,
+            x:33*2,
             y:(restHeight*0.4*0.1)/2
         },
         {
             position:4,
-            width:33*0.9,
+            width:33,
             height:(restHeight)*0.4*0.9,
-            x:(33*0.1)/2,
+            x:0,
             y:38
         },
         {
             position:5,
-            width:33*0.9,
+            width:33,
             height:(restHeight)*0.4*0.9,
-            x:(33*0.1)/2+33,
+            x:33,
             y:38
         },
         {
             position:6,
-            width:33*0.9,
+            width:33,
             height:(restHeight)*0.4*0.9,
-            x:(33*0.1)/2+33*2,
+            x:33*2,
             y:38
         },
         {
             position:7,
-            width:100*0.9,
+            width:100,
             height:(restHeight)*0.18*0.8,
-            x:(100-100*0.9)/2,
+            x:0,
             y:74
         }]
     }