From 11f35805b4c64d2ff790ab9ebaf775d017e4ed06 Mon Sep 17 00:00:00 2001
From: Jack <1638169491@qq.com>
Date: Fri, 5 Aug 2022 09:34:04 +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=AE=8C=E6=88=90?=
 =?UTF-8?q?=E5=A1=94=E5=90=8A=E8=AE=BE=E5=A4=87=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../digitalSite/components/DeviceCard.vue     |  7 +++++-
 .../projectHuScreen/digitalSite/leftTop.vue   | 25 ++++++++++++++++---
 .../projectHuScreen/jChart/bar/JBarChart.vue  |  7 +++++-
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/digitalSite/components/DeviceCard.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/digitalSite/components/DeviceCard.vue
index 3b8ca33a..50b838f2 100644
--- a/src/views/projectAdmin/dataBoard/projectHuScreen/digitalSite/components/DeviceCard.vue
+++ b/src/views/projectAdmin/dataBoard/projectHuScreen/digitalSite/components/DeviceCard.vue
@@ -16,7 +16,9 @@
         </div>
       </div>
     </div>
-    <slot></slot>
+    <div class="content">
+      <slot></slot>
+    </div>
   </div>
 </template>
 
@@ -75,5 +77,8 @@ export default {
       }
     }
   }
+  .content {
+    height: calc(100% - 84px);
+  }
 }
 </style>
diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/digitalSite/leftTop.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/digitalSite/leftTop.vue
index 2d66f149..62d30fd1 100644
--- a/src/views/projectAdmin/dataBoard/projectHuScreen/digitalSite/leftTop.vue
+++ b/src/views/projectAdmin/dataBoard/projectHuScreen/digitalSite/leftTop.vue
@@ -1,7 +1,7 @@
 <template>
   <Card :title="title">
     <DeviceCard :leftCount="{ value: 22, label: '塔吊设备数' }" :rightCount="{ value: 65, label: '今日报警数' }">
-      hello
+      <JBarChart :tooltip="{}" :xData="xData" :yData="yData" />
     </DeviceCard>
   </Card>
 </template>
@@ -9,8 +9,9 @@
 <script>
 import Card from '../components/Card.vue'
 import DeviceCard from './components/DeviceCard.vue'
+import JBarChart from '../jChart/bar/JBarChart.vue'
 export default {
-  components: { Card, DeviceCard },
+  components: { Card, DeviceCard, JBarChart },
   props: {
     title: {
       type: String,
@@ -18,7 +19,25 @@ export default {
     }
   },
   data() {
-    return {}
+    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
+    }
   }
 }
 </script>
diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue
index 1c88d2fa..ed48d0b3 100644
--- a/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue
+++ b/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue
@@ -12,6 +12,10 @@ export default {
         text: ''
       })
     },
+    tooltip: {
+      type: Object,
+      default: () => ({ show: false })
+    },
     grid: {
       type: Array,
       default: () => ['15%', '2%', '2%', '2%']
@@ -43,7 +47,7 @@ export default {
   },
   methods: {
     createChart() {
-      const { title, grid, color, xData, yData, series } = this
+      const { title, tooltip, grid, color, xData, yData, series } = this
       const configSeries = (series => {
         if (series.length) {
           return series.map(item => ({ data: item.data, type: 'bar', barWidth: 15 }))
@@ -62,6 +66,7 @@ export default {
             fontWeight: 'normal'
           }
         },
+        tooltip,
         grid: {
           top: grid[0],
           right: grid[1],