From 5a713676f03af2c789d8910a4bedbd6c02c08093 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Tue, 10 May 2022 18:55:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9top10=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/wel.vue                           | 17 +++++++----------
 src/views/Statistics/BuildingContrast.vue  | 10 +++++-----
 src/views/Statistics/ConsultantBrand.vue   | 10 +++++-----
 src/views/Statistics/ReceptionOverview.vue | 10 ++++------
 src/views/Statistics/TheTeamCompared.vue   | 13 ++++++-------
 src/views/Statistics/index.vue             | 10 ++++------
 src/views/houseData/analyse.vue            | 10 +++++-----
 vue.config.js                              |  4 ++--
 8 files changed, 38 insertions(+), 46 deletions(-)

diff --git a/src/page/wel.vue b/src/page/wel.vue
index ee6e6a9..3c92f5c 100644
--- a/src/page/wel.vue
+++ b/src/page/wel.vue
@@ -241,8 +241,6 @@
             style="
               display: flex;
               flex-wrap: wrap;
-              height: 290px;
-              overflow-y: auto;
               width: 90%;
               margin: 0 auto;
             "
@@ -312,7 +310,7 @@
             <div
               style="
                 overflow-y: auto;
-                height: 230px;
+                height: 100%;
                 width: 94%;
                 margin: 0 auto;
               "
@@ -975,9 +973,8 @@
             <el-table
               :header-cell-style="{ background: '#F2F4F5' }"
               :data="companyRank"
-              height="320"
               style="width: 100%; font-size: 14px"
-              >>
+              >
               <el-table-column
                 prop="companyName"
                 :label="role == 2 ? '项目名称' : '公司名称'"
@@ -1043,7 +1040,6 @@
             <el-table
               :header-cell-style="{ background: '#F2F4F5' }"
               :data="houseRank"
-              height="320"
               style="width: 100%; font-size: 14px"
               >>
               <el-table-column
@@ -1615,6 +1611,7 @@ export default {
     padding-left: 30px;
     padding-right: 30px;
     margin-top: 20px;
+    min-height: 320px;
   }
 }
 .el-row {
@@ -1626,16 +1623,16 @@ export default {
 
 .app-box-san {
   width: 100%;
-  height: 350px;
+  min-height: 350px;
   display: flex;
   margin-top: 15px;
   .zuo {
-    // flex: 1;
-    height: 100%;
+    padding: 0 0 20px 0 ;
     margin-right: 15px;
     background: #ffffff;
     border-radius: 4px;
     width: 48.7%;
+    flex-grow: 1;
     .title {
       width: 100%;
       height: 55px;
@@ -1652,7 +1649,7 @@ export default {
     }
   }
   .you {
-    height: 100%;
+    flex-grow: 1;
     width: 49%;
     background: #ffffff;
     border-radius: 4px;
diff --git a/src/views/Statistics/BuildingContrast.vue b/src/views/Statistics/BuildingContrast.vue
index 9f0d48b..a49aee3 100644
--- a/src/views/Statistics/BuildingContrast.vue
+++ b/src/views/Statistics/BuildingContrast.vue
@@ -140,7 +140,7 @@
           </div>
         </div>
         <div
-          style="overflow-y: auto; height: 250px; width: 94%; margin: 0 auto"
+          style="height: 300px; width: 94%; margin: 0 auto"
         >
           <div class="jinbox" v-for="(item, i) in objList1.list" :key="i">
             <div class="jinboxtit">{{ item.name }}</div>
@@ -169,7 +169,7 @@
           </div>
         </div>
         <div
-          style="overflow-y: auto; height: 250px; width: 94%; margin: 0 auto"
+          style="height: 300px; width: 94%; margin: 0 auto"
         >
           <div class="jinbox" v-for="(item, i) in objList2.list" :key="i">
             <div class="jinboxtit">{{ item.name }}</div>
@@ -205,7 +205,7 @@
           </div>
         </div>
         <div
-          style="overflow-y: auto; height: 250px; width: 94%; margin: 0 auto"
+          style="height: 300px; width: 94%; margin: 0 auto"
         >
           <div class="jinbox" v-for="(item, i) in objList3.list" :key="i">
             <div class="jinboxtit">{{ item.name }}</div>
@@ -238,7 +238,7 @@
           </div>
         </div>
         <div
-          style="overflow-y: auto; height: 250px; width: 94%; margin: 0 auto"
+          style="height: 300px; width: 94%; margin: 0 auto"
         >
           <div class="jinbox" v-for="(item, i) in objList4.list" :key="i">
             <div class="jinboxtit">{{ item.name }}</div>
@@ -635,7 +635,7 @@ export default {
 
 .app-box-san {
   width: 100%;
-  height: 400px;
+  min-height: 400px;
   display: flex;
   margin-top: 15px;
   .zuo {
diff --git a/src/views/Statistics/ConsultantBrand.vue b/src/views/Statistics/ConsultantBrand.vue
index 610d4ee..5513adb 100644
--- a/src/views/Statistics/ConsultantBrand.vue
+++ b/src/views/Statistics/ConsultantBrand.vue
@@ -195,7 +195,7 @@
         </div>
         <div
           v-if="echarlist.length != 0"
-          style="overflow-y: auto; height: 258px; width: 94%; margin: 0 auto"
+          style="min-height: 258px; width: 94%; margin: 0 auto;padding: 0 0 20px 0;"
         >
           <div class="jinbox" v-for="(item, i) in echarlist" :key="i">
             <div class="jinboxtit">{{ item.name }}</div>
@@ -240,7 +240,7 @@
         </div>
         <div
           v-if="echarlist2.length != 0"
-          style="overflow-y: auto; height: 258px; width: 94%; margin: 0 auto"
+          style="min-height: 258px; width: 94%; margin: 0 auto;padding: 0 0 20px 0;"
         >
           <div class="jinbox" v-for="(item, i) in echarlist2" :key="i">
             <div class="jinboxtit">{{ item.name }}</div>
@@ -299,7 +299,7 @@
         </div>
         <div
           v-if="echarlist1.length != 0"
-          style="overflow-y: auto; height: 258px; width: 94%; margin: 0 auto"
+          style="min-height: 258px; width: 94%; margin: 0 auto;padding: 0 0 20px 0;"
         >
           <div class="jinbox" v-for="(item, i) in echarlist1" :key="i">
             <div class="jinboxtit">{{ item.name }}</div>
@@ -359,7 +359,7 @@
         </div>
         <div
           v-if="echarlist3.length != 0"
-          style="overflow-y: auto; height: 258px; width: 94%; margin: 0 auto"
+          style="min-height: 258px; width: 94%; margin: 0 auto;padding: 0 0 20px 0;"
         >
           <div class="jinbox" v-for="(item, i) in echarlist3" :key="i">
             <div class="jinboxtit">{{ item.name }}</div>
@@ -910,7 +910,7 @@ export default {
 
 .app-box-san {
   width: 100%;
-  height: 400px;
+  min-height: 400px;
   display: flex;
   margin-top: 15px;
   .zuo {
diff --git a/src/views/Statistics/ReceptionOverview.vue b/src/views/Statistics/ReceptionOverview.vue
index 1417065..0d2359b 100644
--- a/src/views/Statistics/ReceptionOverview.vue
+++ b/src/views/Statistics/ReceptionOverview.vue
@@ -273,8 +273,7 @@
         <div
           v-if="ceratelist.list.length != 0"
           style="
-            overflow-y: auto;
-            height: 320px;
+            height: 360px;
             width: 94%;
             margin: 0 auto;
             margin-top: 15px;
@@ -290,7 +289,7 @@
               ></div>
             </div>
             <div class="jinboxbott">
-              {{ item.zxl }}{{ activeName | company }}
+              {{ item.zxl || 0 }}{{ activeName | company }}
             </div>
           </div>
         </div>
@@ -336,8 +335,7 @@
         <div
           v-if="systemList.list.length != 0"
           style="
-            overflow-y: auto;
-            height: 320px;
+            height: 360px;
             width: 94%;
             margin: 0 auto;
             margin-top: 15px;
@@ -1336,7 +1334,7 @@ export default {
           str = "次";
           break;
         case 1:
-          str = "分钟";
+          str = "";
           break;
         case 2:
           str = "次";
diff --git a/src/views/Statistics/TheTeamCompared.vue b/src/views/Statistics/TheTeamCompared.vue
index bead3c1..5b41d24 100644
--- a/src/views/Statistics/TheTeamCompared.vue
+++ b/src/views/Statistics/TheTeamCompared.vue
@@ -117,7 +117,7 @@
         </div>
         <div
           v-if="teamobj1.list.length != 0"
-          style="overflow-y: auto; height: 350px; width: 94%; margin: 0 auto"
+          style="min-height: 350px; width: 94%; margin: 0 auto"
         >
           <div class="jinbox" v-for="(item, i) in teamobj1.list" :key="i">
             <div class="jinboxtit">{{ item.name }}</div>
@@ -159,7 +159,7 @@
         </div>
         <div
           v-if="teamobj2.list.length != 0"
-          style="overflow-y: auto; height: 350px; width: 94%; margin: 0 auto"
+          style="min-height: 350px; width: 94%; margin: 0 auto"
         >
           <div class="jinbox" v-for="(item, i) in teamobj2.list" :key="i">
             <div class="jinboxtit">{{ item.name }}</div>
@@ -218,7 +218,7 @@
         </div>
         <div
           v-if="teamobj3.list.length != 0"
-          style="overflow-y: auto; height: 350px; width: 94%; margin: 0 auto"
+          style="min-height: 350px; width: 94%; margin: 0 auto"
         >
           <div class="jinbox" v-for="(item, i) in teamobj3.list" :key="i">
             <div class="jinboxtit">{{ item.name }}</div>
@@ -293,7 +293,7 @@
         </div>
         <div
           v-if="teamobj5.list.length != 0"
-          style="overflow-y: auto; height: 350px; width: 94%; margin: 0 auto"
+          style="min-height: 350px; width: 94%; margin: 0 auto"
         >
           <div class="jinbox" v-for="(item, i) in teamobj5.list" :key="i">
             <div class="jinboxtit">{{ item.name }}</div>
@@ -324,7 +324,7 @@
         <div
           v-if="isshowcd == true"
           id="main2"
-          style="height: 350px; width: 94%; margin: 0 auto"
+          style="min-height: 350px; width: 94%; margin: 0 auto"
         ></div>
         <div class="nulllist" style="height: 300px" v-if="isshowcd == false">
           <div class="imgboxc">
@@ -926,7 +926,6 @@ tbody {
   display: block;
   // width: 100%;
   // overflow-x: auto;
-  // overflow-y: auto;
   height: 220px;
 }
 tbody tr {
@@ -993,7 +992,7 @@ tbody tr {
 
 .app-box-san {
   width: 100%;
-  height: 400px;
+  min-height: 400px;
   display: flex;
   margin-top: 15px;
   .zuo {
diff --git a/src/views/Statistics/index.vue b/src/views/Statistics/index.vue
index 3c5f1f6..9cd57d0 100644
--- a/src/views/Statistics/index.vue
+++ b/src/views/Statistics/index.vue
@@ -478,13 +478,11 @@ export default {
 
 .box-forhtml {
   width: 100%;
-  height: 400px;
+  min-height: 400px;
   background: #ffffff;
   box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.04);
   border-radius: 4px;
-  padding-top: 20px;
-  padding-left: 30px;
-  padding-right: 30px;
+  padding: 20px 30px;
   margin-top: 20px;
 }
 .box-forhtml-flex {
@@ -494,11 +492,11 @@ export default {
 }
 .box-forhtml-flex .left {
   width: 50%;
-  height: 320px;
+  min-height: 320px;
 }
 .box-forhtml-flex .right {
   width: 50%;
-  height: 330px;
+  min-height: 330px;
   display: flex;
   justify-content: center;
 }
diff --git a/src/views/houseData/analyse.vue b/src/views/houseData/analyse.vue
index 22e7b51..f36e381 100644
--- a/src/views/houseData/analyse.vue
+++ b/src/views/houseData/analyse.vue
@@ -115,7 +115,7 @@
         <div class="title">
           <div class="text1">目标分析</div>
         </div>
-        <div style="height: 350px; width: 94%; margin: 0 auto">
+        <div style="min-height: 350px;padding: 0 0 20px 0;width: 94%; margin: 0 auto">
           <div id="data1" style="min-height: 350px"></div>
         </div>
       </div>
@@ -144,7 +144,7 @@
           </div>
         </div>
         <div
-          style="overflow-y: auto; height: 350px; width: 94%; margin: 0 auto"
+          style="min-height: 350px;padding: 0 0 20px 0; width: 94%; margin: 0 auto;"
         >
           <div class="jinbox" v-for="(item, i) in objList" :key="i">
             <div class="jinboxtit">{{ item.name }}</div>
@@ -164,7 +164,7 @@
         <div class="title">
           <div class="text1">对比上月分析</div>
         </div>
-        <div style="height: 350px; width: 94%; margin: 0 auto">
+        <div style="min-height: 350px;padding: 0 0 20px 0;width: 94%; margin: 0 auto">
           <div id="data2" style="min-height: 350px"></div>
         </div>
       </div>
@@ -200,7 +200,7 @@
           </div>
         </div>
         <div
-          style="overflow-y: auto; height: 350px; width: 94%; margin: 0 auto"
+          style="min-height: 350px;padding: 0 0 20px 0;width: 94%; margin: 0 auto"
         >
           <div class="jinbox" v-for="(item, i) in objList1" :key="i">
             <div class="jinboxtit">{{ item.name }}</div>
@@ -312,7 +312,7 @@
 
     <el-dialog title="趋势图" :visible.sync="dialogVisible">
       <div class="houseSize">项目： {{houseName||''}} 运营：{{operationStaffName||'暂无'}}</div>
-      <div style="height: 350px; width: 94%; margin: 0 auto">
+      <div style="min-height: 350px;padding: 0 0 20px 0;width: 94%; margin: 0 auto">
         <div id="line" style="min-height: 350px"></div>
       </div>
       <!-- <div slot="footer" class="dialog-footer">
diff --git a/vue.config.js b/vue.config.js
index aae7ffb..ad5c82c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -11,8 +11,8 @@
 // const url = 'http://81.70.55.170:9999' // 新测试服务器IP
 // const url = 'http://192.168.31.89:9999' //sh
 // const url = 'https://zanyong.hfju.com' // 正式域名
-// const url = 'http://81.70.55.170:9999' // 新测试
-const url = 'http://82.156.35.22:9999' // 新正式ip
+const url = 'http://81.70.55.170:9999' // 新测试
+// const url = 'http://82.156.35.22:9999' // 新正式ip
 const CompressionWebpackPlugin = require('compression-webpack-plugin')
 const productionGzipExtensions = ['js', 'css']
 module.exports = {