From da8cf0a27b1277e6fbd46119b5d55e56eaf75d80 Mon Sep 17 00:00:00 2001
From: Jack <1638169491@qq.com>
Date: Sat, 13 Aug 2022 13:48:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A4=A7=E5=B1=8F(=E6=95=B0?=
 =?UTF-8?q?=E5=AD=97=E5=B7=A5=E5=9C=B0)=EF=BC=9A=E5=8D=87=E9=99=8D?=
 =?UTF-8?q?=E6=9C=BA=E8=AE=BE=E5=A4=87=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectAdmin/jlw/components/CountList.vue |  3 ++
 .../projectAdmin/jlw/digitalSite/rightTop.vue | 52 +++++++------------
 2 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/src/views/projectAdmin/jlw/components/CountList.vue b/src/views/projectAdmin/jlw/components/CountList.vue
index 598f9115..148348ab 100644
--- a/src/views/projectAdmin/jlw/components/CountList.vue
+++ b/src/views/projectAdmin/jlw/components/CountList.vue
@@ -97,6 +97,9 @@ export default {
         &.warring2 {
           background-image: url('~@/views/projectAdmin/dataBoard/projectHuScreen/assets/images/icons/i-warring2.png');
         }
+        &.elevator {
+          background-image: url('~@/views/projectAdmin/dataBoard/projectHuScreen/assets/images/icons/i-elevator.png');
+        }
         &.facegate {
           background-image: url('~@/views/projectAdmin/dataBoard/projectHuScreen/assets/images/icons/i-face-gate.png');
         }
diff --git a/src/views/projectAdmin/jlw/digitalSite/rightTop.vue b/src/views/projectAdmin/jlw/digitalSite/rightTop.vue
index 70931f35..494bf265 100644
--- a/src/views/projectAdmin/jlw/digitalSite/rightTop.vue
+++ b/src/views/projectAdmin/jlw/digitalSite/rightTop.vue
@@ -1,6 +1,6 @@
 <template>
   <Card :title="title">
-    <DeviceCard
+    <!-- <DeviceCard
       :leftCount="{ value: totalLifterDev, label: '升降机设备数', img: 'elevator' }"
       :rightCount="{ value: totalDangerLifterDev, label: '今日报警数', img: 'warring2' }"
     >
@@ -9,54 +9,40 @@
         <div class="item">离线</div>
       </div>
       <JBarChart :tooltip="{}" :xData="xData" :yData="yData" />
-    </DeviceCard>
+    </DeviceCard> -->
+
+    <CountList
+      :allCount="{ value: totalTowerDev, label: '升降机设备数', img: 'elevator' }"
+      :todayCount="{ value: totalDangerTowerDev, label: '今日报警数', img: 'warring2' }"
+      :list="lifterList"
+    />
   </Card>
 </template>
 
 <script>
 import Card from '../components/Card.vue'
-import DeviceCard from './components/DeviceCard.vue'
-import JBarChart from '../jChart/bar/JBarChart.vue'
+// import DeviceCard from './components/DeviceCard.vue'
+// import JBarChart from '../jChart/bar/JBarChart.vue'
+import CountList from '../components/CountList.vue'
 export default {
-  components: { Card, DeviceCard, JBarChart },
+  // components: { Card, DeviceCard, JBarChart },
+  components: { Card, CountList },
   props: {
     title: {
       type: String,
       default: ''
     },
-    totalLifterDev:{
+    totalLifterDev: {
       type: Number,
-      default: ""
+      default: ''
     },
-    totalDangerLifterDev:{
+    totalDangerLifterDev: {
       type: Number,
-      default: ""
+      default: ''
     },
-    lifterList:{
+    lifterList: {
       type: Array,
-      default: ""
-    }
-    
-  },
-  data() {
-    const yData = [23, 44, 63, 12, 45, 78, 34, 67].map((value, i) => {
-      if (i > 4 && i < 7) {
-        return {
-          name: '离线',
-          value,
-          itemStyle: { color: '#FF6C7F' }
-        }
-      } else {
-        return {
-          name: '报警数',
-          value,
-          itemStyle: { color: '#3CABFD' }
-        }
-      }
-    })
-    return {
-      xData: ['1号', '2号', '3号', '4号', '5号', '6号', '7号', '8号'],
-      yData
+      default: ''
     }
   }
 }