From 83e1b98af34935b5f7069a805064213bb56601d4 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Thu, 21 Jul 2022 15:41:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                 | 2 +-
 src/page/wel.vue                            | 4 ++--
 src/views/Equipment/equipmentDetailList.vue | 6 +++---
 src/views/Statistics/ReceptionOverview.vue  | 6 ++----
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 5513637..6b7b710 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -31,7 +31,7 @@ export default {
   border-color: #2671E2 !important;
 }
 .el-scrollbar__wrap{
-  height: 100vh !important;
+  height: 100vh ;
 }
 .el-table__row{
   font-size: 14px!important;
diff --git a/src/page/wel.vue b/src/page/wel.vue
index 75b3205..53af99c 100644
--- a/src/page/wel.vue
+++ b/src/page/wel.vue
@@ -262,7 +262,7 @@
                     <i class="pop"></i>
                   </el-tooltip>
                 </div>
-                <div class="span1">{{ cardlist.datalist.prohibitedZb || 0 }}</div>
+                <div class="span1">{{ cardlist.datalist.prohibitedZb || 0 }}%</div>
               </div>
 
               <div class="cardicon">
@@ -1277,7 +1277,7 @@
                   <el-tooltip effect="light" content="筛选时间内，活跃设备/总设备*100%；" placement="bottom-end">
                     <i class="pop"></i>
                   </el-tooltip></div>
-                  <div class="span1">{{ sysSec.activeEquipmentQuantityZB || 0 }}</div>
+                  <div class="span1">{{ sysSec.activeEquipmentQuantityZB || 0 }}%</div>
                 </div>
 
                 <div class="cardicon">
diff --git a/src/views/Equipment/equipmentDetailList.vue b/src/views/Equipment/equipmentDetailList.vue
index 53c62d0..348379b 100644
--- a/src/views/Equipment/equipmentDetailList.vue
+++ b/src/views/Equipment/equipmentDetailList.vue
@@ -178,7 +178,7 @@
                 在线设备占比
               </div>
               <div class="text2">
-                {{ details.onlineRate || 0 }}
+                {{ details.onlineRate || 0 }}%
               </div>
               <div class="text3" v-if="selectTime1">
                 <span>环比 {{ details1.onlineRate || 0 }}</span>
@@ -223,7 +223,7 @@
                 活跃设备占比
               </div>
               <div class="text2">
-                {{ details.activeRate || 0 }}
+                {{ details.activeRate || 0 }}%
               </div>
               <div class="text3" v-if="selectTime1">
                 <span>环比 {{ details1.activeRate || 0 }}</span>
@@ -295,7 +295,7 @@
                 </el-tooltip>
               </div>
               <div class="text2">
-                {{ details.fullRecordRate || 0 }}
+                {{ details.fullRecordRate || 0 }}%
               </div>
               <div class="text3" v-if="selectTime1">
                 <span>环比 {{ details1.fullRecordRate || 0 }}</span>
diff --git a/src/views/Statistics/ReceptionOverview.vue b/src/views/Statistics/ReceptionOverview.vue
index 1143826..2d24349 100644
--- a/src/views/Statistics/ReceptionOverview.vue
+++ b/src/views/Statistics/ReceptionOverview.vue
@@ -477,8 +477,7 @@
         <div
           v-if="Zxllist.length != 0"
           style="
-            overflow-y: auto;
-            height: 320px;
+            min-height: 320px;
             width: 94%;
             margin: -18px auto 16px;
           "
@@ -594,8 +593,7 @@
         <div
           v-if="Zxllistchildren.length != 0"
           style="
-            overflow-y: auto;
-            height: 320px;
+            min-height: 320px;
             width: 94%;
             margin: -18px auto 16px;
           "