From 134e1680296ca36a44766d82c479563e62d38a48 Mon Sep 17 00:00:00 2001
From: jyt <1592211625@qq.com>
Date: Wed, 15 Jun 2022 15:59:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Statistics/BuildingContrast.vue | 16 +++++++++-------
 src/views/Statistics/dataScreeSys.vue     |  8 ++++----
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/views/Statistics/BuildingContrast.vue b/src/views/Statistics/BuildingContrast.vue
index cd1a0f1..b4e94d9 100644
--- a/src/views/Statistics/BuildingContrast.vue
+++ b/src/views/Statistics/BuildingContrast.vue
@@ -97,7 +97,7 @@
             <div class="text1-2">{{ objList1.avg }}次</div>
           </div>
         </div>
-        <div style="height: 300px; width: 94%; margin: 0 auto">
+        <div style="width: 94%; margin: 0 auto">
           <div class="jinbox" v-for="(item, i) in objList1.list" :key="i">
             <span class="sequenceNum" :style="{
               'background': i + 1 == 1 ? '#F54D3F' : i + 1 == 2 ? '#FF981E' : i + 1 == 3 ? '#FFCC00' : '#E5F0FF',
@@ -138,7 +138,7 @@
             <div class="text1-2">{{ objList2.avg }}%</div>
           </div>
         </div>
-        <div style="height: 300px; width: 94%; margin: 0 auto">
+        <div style="width: 94%; margin: 0 auto">
           <div class="jinbox" v-for="(item, i) in objList2.list" :key="i">
             <span class="sequenceNum" :style="{
               'background': i + 1 == 1 ? '#F54D3F' : i + 1 == 2 ? '#FF981E' : i + 1 == 3 ? '#FFCC00' : '#E5F0FF',
@@ -186,7 +186,7 @@
             <div class="text1-2">{{ objList3.avg }}次</div>
           </div>
         </div>
-        <div style="height: 300px; width: 94%; margin: 0 auto">
+        <div style=" width: 94%; margin: 0 auto">
           <div class="jinbox" v-for="(item, i) in objList3.list" :key="i">
             <span class="sequenceNum" :style="{
               'background': i + 1 == 1 ? '#F54D3F' : i + 1 == 2 ? '#FF981E' : i + 1 == 3 ? '#FFCC00' : '#E5F0FF',
@@ -230,7 +230,7 @@
             <div class="text1-2">{{ objList4.avg }}分钟</div>
           </div>
         </div>
-        <div style="height: 300px; width: 94%; margin: 0 auto">
+        <div style=" width: 94%; margin: 0 auto">
           <div class="jinbox" v-for="(item, i) in objList4.list" :key="i">
             <span class="sequenceNum" :style="{
               'background': i + 1 == 1 ? '#F54D3F' : i + 1 == 2 ? '#FF981E' : i + 1 == 3 ? '#FFCC00' : '#E5F0FF',
@@ -621,7 +621,7 @@ export default {
 <style scoped="scoped" lang="scss" >
 .sequenceNum {
   display: flex;
-  width: 24px;
+  width: 26px;
   height: 24px;
   justify-content: center;
   align-items: center;
@@ -700,6 +700,7 @@ export default {
     margin-right: 15px;
     background: #ffffff;
     border-radius: 4px;
+    padding-bottom: 22px;
 
     .title {
       width: 100%;
@@ -731,6 +732,7 @@ export default {
     flex: 1;
     background: #ffffff;
     border-radius: 4px;
+    padding-bottom: 22px;
 
     .title {
       width: 100%;
@@ -784,7 +786,7 @@ export default {
   display: flex;
   font-size: 16px;
   color: #2c3542;
-  margin-top: 10px;
+  margin-top: 20px;
 
   .jinboxtit {
     width: 14%;
@@ -796,7 +798,7 @@ export default {
 
     .sequenceNum {
       display: flex;
-      width: 24px;
+      width: 26px;
       height: 24px;
       justify-content: center;
       align-items: center;
diff --git a/src/views/Statistics/dataScreeSys.vue b/src/views/Statistics/dataScreeSys.vue
index a0850e6..6e0b935 100644
--- a/src/views/Statistics/dataScreeSys.vue
+++ b/src/views/Statistics/dataScreeSys.vue
@@ -640,11 +640,11 @@
               <span @click="goDetail1(row, '购买服务项目数', 0)" style="cursor: pointer">{{ row.buyHouseQuantity || 0 }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="activeUserQuantity" label="活跃用户数" align="center">
+          <!-- <el-table-column prop="activeUserQuantity" label="活跃用户数" align="center">
             <template slot-scope="{ row }">
               <span @click="goDetail1(row, '活跃用户数', 1)" style="cursor: pointer">{{ row.activeUserQuantity }}</span>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column prop="newJoinUserQuantity" label="新增用户数" align="center">
             <template slot-scope="{ row }">
               <span @click="goDetail1(row, '新增用户数', 2)" style="cursor: pointer">{{ row.newJoinUserQuantity || 0
@@ -667,11 +667,11 @@
               }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="buyEquipQuantity" label="销售设备数" align="center">
+          <!-- <el-table-column prop="buyEquipQuantity" label="销售设备数" align="center">
             <template slot-scope="{ row }">
               <span @click="goDetail1(row, '销售设备数', 6)" style="cursor: pointer">{{ row.buyEquipQuantity || 0 }}</span>
             </template>
-          </el-table-column>
+          </el-table-column> -->
         </el-table>
         <div style="display: flex; justify-content: flex-end; margin-top: 10px">
           <el-pagination @size-change="handleSizeChange1" @current-change="handleCurrentChange1"