qymljy пре 1 година
родитељ
комит
e8fd27d8f8

+ 6 - 3
src/views/salesData/modules/orderProductCategory.vue

@@ -80,7 +80,7 @@
         </div>
       </div>
       <div class="chart" style="height: 416px;align-items: center;">
-        <div id="orderProductCategoryChart" style="height: 400px;vertical-align: middle;line-height: 400px" :style="{height:heightChart,width:windowWidth < 1355?'48%':windowWidth<1533?'41%':windowWidth<1919?'35%':'42%',float:'left'}"></div>
+        <div id="orderProductCategoryChart" style="height: 400px;vertical-align: middle;line-height: 400px" :style="{height:heightChart,width:windowWidth < 1355?'48%':windowWidth<1533?'41%':windowWidth<1919?'35%':'42%',float:'left',marginTop:marginChart}"></div>
         <div style="float: right;" :style="windowWidth<1355?'width:52%':windowWidth<1533?'width:59%':windowWidth<1919?'width:65%':'width:58%'">
           <tableTemplate style="margin-top: 10px" ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" :height="heightTable" fixedName="operation">
             <template v-slot:customcol="scope">
@@ -174,7 +174,8 @@ export default {
       tradefieldList:[],
       brandList:[],
       listqueryid:'',
-      pageTotal:0
+      pageTotal:0,
+      marginChart:0
     }
   },
   methods:{
@@ -401,14 +402,16 @@ export default {
     },
     /*全屏*/
     onFull(){
-      this.heightChart = 'calc(100vh - 385px)'
+      this.heightChart = 'calc(100vh - 585px)'
       this.heightTable ='calc(100vh - 165px)'
+      this.marginChart = 'calc(20vh)'
       this.isFull = true
     },
     /*退出全屏*/
     backFull(val){
       this.heightChart = '98%'
       this.heightTable = '352px'
+      this.marginChart = 0
       this.isFull = false
       this.$emit('backFull',val)
     },

+ 6 - 3
src/views/salesData/modules/orderType.vue

@@ -53,7 +53,7 @@
         </div>
       </div>
       <div class="chart" style="height: 416px">
-        <div id="orderTypeChart" style="height: 400px;" :style="{height:heightChart,width:windowWidth < 1505?'54%':windowWidth<1805?'54%':windowWidth<2500?'45%':'42%',float:'left'}"></div>
+        <div id="orderTypeChart" style="height: 400px;" :style="{height:heightChart,width:windowWidth < 1505?'54%':windowWidth<1805?'54%':windowWidth<2500?'45%':'42%',float:'left',marginTop:marginChart}"></div>
         <div style="float: right;" :style="windowWidth<1505?'width:46%':windowWidth<1805?'width:46%':windowWidth<2500?'width:55%':'width:58%'">
           <tableTemplate style="margin-top: 10px" ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" :height="heightTable" fixedName="operation">
             <template v-slot:customcol="scope">
@@ -134,7 +134,8 @@ export default {
       heightTable:'352px',
       isFull:false,
       listqueryid:'',
-      pageTotal:0
+      pageTotal:0,
+      marginChart:0
     }
   },
   methods:{
@@ -361,14 +362,16 @@ export default {
     },
     /*全屏*/
     onFull(){
-      this.heightChart = 'calc(100vh - 85px)'
+      this.heightChart = 'calc(100vh - 585px)'
       this.heightTable ='calc(100vh - 125px)'
+      this.marginChart = 'calc(20vh)'
       this.isFull = true
     },
     /*退出全屏*/
     backFull(val){
       this.heightChart = '98%'
       this.heightTable = '352px'
+      this.marginChart = 0
       this.isFull = false
       this.$emit('backFull',val)
     },