From 0a1b5cc41a4e281bbc2bd026222df895d25b72f6 Mon Sep 17 00:00:00 2001
From: xuyucheng <Nd17cCxTS4SSDDh21SaA>
Date: Fri, 10 Jun 2022 16:58:42 +0800
Subject: [PATCH] new commit

---
 src/api/request.js               |  2 +-
 src/assets/style/home/index.scss |  3 ++-
 src/view/home/index.vue          | 10 ++++++++--
 src/view/home/main/dashboard.vue | 31 ++++++++++++++++++++-----------
 4 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/src/api/request.js b/src/api/request.js
index 7dcbe47..b9862a7 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -118,7 +118,7 @@ export default {
   },
 
   //  blob - post
-  BlobPost: function (path = '', data = {}) {
+  BlobPost: function (path = '', data = {}) {   
     return new Promise(function (resolve, reject) {
       axios.post(
         path, data, { responseType: 'blob' })
diff --git a/src/assets/style/home/index.scss b/src/assets/style/home/index.scss
index 889e621..2ffdf43 100644
--- a/src/assets/style/home/index.scss
+++ b/src/assets/style/home/index.scss
@@ -78,6 +78,7 @@
 
     .main-row {
       height: 100%;
+      margin: 0 !important;
       display: flex;
       align-content: space-between;
       flex-wrap: wrap;
@@ -87,7 +88,7 @@
 
         #map {
           width: 100%;
-          height: 500px;
+          // height: 500px;
         }
       }
     }
diff --git a/src/view/home/index.vue b/src/view/home/index.vue
index 660a3dc..0667b3a 100644
--- a/src/view/home/index.vue
+++ b/src/view/home/index.vue
@@ -31,7 +31,7 @@
             <span slot="label"
               ><i :class="item.icon"></i> {{ item.title }}</span
             >
-            <component :is="item.content" />
+            <div class="pane-box"><component :is="item.content" /></div>
           </el-tab-pane>
         </el-tabs>
       </el-main>
@@ -123,7 +123,13 @@ export default {
 
   .el-tab-pane {
     height: 100%;
-    overflow: auto;
+    overflow: hidden;
+
+    .pane-box{
+      width:calc(100% + 5px);
+      height: 100%;
+       overflow: auto;
+    }
   }
 }
 </style>
\ No newline at end of file
diff --git a/src/view/home/main/dashboard.vue b/src/view/home/main/dashboard.vue
index b659fb7..3def654 100644
--- a/src/view/home/main/dashboard.vue
+++ b/src/view/home/main/dashboard.vue
@@ -1,7 +1,7 @@
 <!-- 看板 -->
 <template>
-  <el-row :gutter="40" class="main-row">
-    <el-col :span="12" style="height: 48%">
+  <el-row class="main-row">
+    <el-col :span="12">
       <el-card
         class="box-card"
         :body-style="{ height: 'calc(100% - 94px)', overflow: 'auto' }"
@@ -15,11 +15,10 @@
           <span>评级结果地图</span>
           <i class="el-icon-more"></i>
         </el-row>
-
         <fecr-map :height.sync="height" :data="ratingProvince" />
       </el-card>
     </el-col>
-    <el-col :span="12" style="height: 48%">
+    <el-col :span="12">
       <el-card
         class="box-card"
         :body-style="{ height: '100%', overflow: 'auto' }"
@@ -35,7 +34,7 @@
         <fecr-line :data="ratingNumber" :height="height" />
       </el-card>
     </el-col>
-    <el-col :span="12" style="height: 48%">
+    <el-col :span="12">
       <el-card
         class="box-card"
         :body-style="{ height: '100%', overflow: 'auto' }"
@@ -51,7 +50,7 @@
         <fecr-pie :data="ratingPie" id="ratingPie" :height="height" />
       </el-card>
     </el-col>
-    <el-col :span="12" style="height: 48%">
+    <el-col :span="12">
       <el-card
         class="box-card"
         :body-style="{ height: '100%', overflow: 'auto' }"
@@ -83,7 +82,7 @@ export default {
   components: { FecrPie, FecrMap, FecrLine, FecrTable },
   data() {
     return {
-      height: 0,
+      height: 500,
       ratingPie: [],
       ratingNumber: {},
       ratingResult: [],
@@ -92,10 +91,10 @@ export default {
   },
 
   created() {
-    this.height = document.body.clientHeight * 0.35;
-    window.addEventListener("resize", function () {
-      this.height = document.body.clientHeight * 0.35;
-    });
+    // this.height = document.body.clientHeight * 0.35;
+    // window.addEventListener("resize", function () {
+    //   this.height = document.body.clientHeight * 0.35;
+    // });
     this.getRatingPie();
     this.getRatingTable();
     this.getRatingNumber();
@@ -170,4 +169,14 @@ export default {
 </script>
 <style lang='scss' scoped>
 @import "assets/style/home/index.scss";
+
+.el-col:nth-child(2n){
+  box-sizing:border-box;
+  padding:0 0 20px 10px;
+}
+
+.el-col:nth-child(2n+1){
+  box-sizing:border-box;
+  padding:0 10px 20px 0;
+}
 </style>
\ No newline at end of file