From cb5b60a110641339c6073b1b91178f000de3e4d7 Mon Sep 17 00:00:00 2001
From: Jack <1638169491@qq.com>
Date: Thu, 4 Aug 2022 15:06:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A4=A7=E5=B1=8F(CIM+)?=
 =?UTF-8?q?=EF=BC=9A=E5=AE=8C=E6=88=90=20BIM=20=E9=A2=84=E7=95=99=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectHuScreen/CIM/rightTop.vue          | 43 +++++++------------
 .../projectHuScreen/components/CountList.vue  | 17 +++++++-
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/CIM/rightTop.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/CIM/rightTop.vue
index 7f31edf3..dbc50ed8 100644
--- a/src/views/projectAdmin/dataBoard/projectHuScreen/CIM/rightTop.vue
+++ b/src/views/projectAdmin/dataBoard/projectHuScreen/CIM/rightTop.vue
@@ -1,42 +1,29 @@
 <template>
-<!-- Bim预留接口 -->
-<div class="container">
-    <div class="titleTxt">{{ title }}</div>
-
-</div>
+  <Card :title="title">
+    <CountList
+      type="persons"
+      :allCount="{ value: 22, label: '人脸闸机总数' }"
+      :todayCount="{ value: 65, label: '今日报警总数' }"
+      :list="[]"
+    />
+  </Card>
 </template>
 
 <script>
+import Card from '../components/Card.vue'
+import CountList from '../components/CountList.vue'
 export default {
-
+  components: { Card, CountList },
   props: {
     title: {
       type: String,
-      default: "default title"
+      default: 'default title'
     }
   },
   data() {
-    return {
-
-    };
-  },
-
-
+    return {}
+  }
 }
 </script>
 
-<style lang="less" scoped>
-.container {
-  width: 100%;
-  height: 100%;
-  border: 1px solid #0081c3;
-
-  .titleTxt {
-    font-size: 18px;
-    color: #6ee4f0;
-    margin-top: 5px;
-    margin-left: 5px;
-  }
-}
-</style>
-
+<style lang="less" scoped></style>
diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/components/CountList.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/components/CountList.vue
index 9bc1fddc..0b6bb767 100644
--- a/src/views/projectAdmin/dataBoard/projectHuScreen/components/CountList.vue
+++ b/src/views/projectAdmin/dataBoard/projectHuScreen/components/CountList.vue
@@ -20,7 +20,11 @@
       <div class="list-item" :class="i === 2 ? 'offline' : 'online'" v-for="i in 3" :key="i">
         <div class="status">在线</div>
         <div class="label">1号塔吊</div>
-        <div class="num">今日报警：2</div>
+        <div class="num" v-if="type === 'waring'">今日报警：2</div>
+        <div class="persons" v-if="type === 'persons'">
+          <div class="person">进场人数：67</div>
+          <div class="person">出场人数：67</div>
+        </div>
       </div>
     </div>
   </div>
@@ -29,6 +33,10 @@
 <script>
 export default {
   props: {
+    type: {
+      type: String,
+      default: 'waring'
+    },
     allCount: {
       type: Object,
       required: true,
@@ -122,6 +130,13 @@ export default {
       .num {
         width: 100px;
       }
+      .persons {
+        width: 200px;
+        display: flex;
+        .person {
+          flex: 1;
+        }
+      }
     }
   }