From ccfbe831a0305098d7682037dd8b0b4a230a9cdf Mon Sep 17 00:00:00 2001
From: Jack <1638169491@qq.com>
Date: Mon, 1 Aug 2022 17:09:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F(=E6=95=B0=E5=AD=97=E5=B7=A5?=
 =?UTF-8?q?=E5=9C=B0)=EF=BC=9A=E4=BD=BF=E7=94=A8=20DataCard=20=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=BC=98=E5=8C=96=E4=BA=BA=E8=84=B8=E9=97=B8=E6=9C=BA?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataBoard/digitalSite/DataCard.vue        | 59 ++++++++++---------
 .../dataBoard/digitalSite/index.vue           | 57 ++++--------------
 2 files changed, 43 insertions(+), 73 deletions(-)

diff --git a/src/views/projectAdmin/dataBoard/digitalSite/DataCard.vue b/src/views/projectAdmin/dataBoard/digitalSite/DataCard.vue
index e3625b4b..c8793993 100644
--- a/src/views/projectAdmin/dataBoard/digitalSite/DataCard.vue
+++ b/src/views/projectAdmin/dataBoard/digitalSite/DataCard.vue
@@ -26,34 +26,31 @@
       </div>
       <div class="list">
         <vue-scroll>
-          <div
-            class="list-item"
-            :class="
-              item.devonline !== undefined
-                ? item.devonline == 0
-                  ? 'offline'
-                  : 'online'
-                : item.devOnline == 2
-                ? 'offline'
-                : 'online'
-            "
-            v-for="(item, index) in list"
-            :key="index"
-          >
-            <span class="type">
-              {{
-                item.devonline !== undefined
-                  ? item.devonline == 0
-                    ? '在线'
-                    : '离线'
-                  : item.devOnline == 2
-                  ? '离线'
-                  : '在线'
-              }}
-            </span>
-            <p>{{ item.devName || item.deviceName }}</p>
-            <span class="alarm">今日报警:{{ item.alarmNum || 0 }}</span>
-          </div>
+          <template v-if="type === 'face'">
+            <div class="list-item" :class="item.deviceState == 2 ? 'offline' : 'online'" v-for="(item, index) in list" :key="index">
+              <span class="type" v-if="item.deviceState == 1">在线</span>
+              <span class="type" v-else>离线</span>
+              <p>{{ item.devName }}</p>
+              <span class="alarm">进场人数:{{ item.inTotalNum }}</span>
+              <span class="alarm">出场人数:{{ item.outTotalNum }}</span>
+            </div>
+          </template>
+          <template v-else>
+            <div
+              class="list-item"
+              :class="
+                item.devonline !== undefined ? (item.devonline == 0 ? 'offline' : 'online') : item.devOnline == 2 ? 'offline' : 'online'
+              "
+              v-for="(item, index) in list"
+              :key="index"
+            >
+              <span class="type">
+                {{ item.devonline !== undefined ? (item.devonline == 0 ? '在线' : '离线') : item.devOnline == 2 ? '离线' : '在线' }}
+              </span>
+              <p>{{ item.devName || item.deviceName }}</p>
+              <span class="alarm">今日报警:{{ item.alarmNum || 0 }}</span>
+            </div>
+          </template>
         </vue-scroll>
       </div>
     </div>
@@ -82,6 +79,10 @@ export default {
       type: Array,
       required: true,
       default: () => []
+    },
+    type: {
+      type: String,
+      default: ''
     }
   }
 }
@@ -179,4 +180,4 @@ export default {
     color: #f67f51;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/projectAdmin/dataBoard/digitalSite/index.vue b/src/views/projectAdmin/dataBoard/digitalSite/index.vue
index 2bafb6c8..e2d19904 100644
--- a/src/views/projectAdmin/dataBoard/digitalSite/index.vue
+++ b/src/views/projectAdmin/dataBoard/digitalSite/index.vue
@@ -2241,50 +2241,19 @@
         </el-dialog>
       </div>
       <div v-if="company != 'henan'" class="fullHeight aside">
-        <div class="blockBox">
-          <!-- 人脸闸机 -->
-          <div class="blockTitle">{{ $t('message.companyDiagram.ufaceDev') }}</div>
-          <div class="blockContent">
-            <div class="devInfoBox">
-              <div class="item">
-                <img src="@/assets/images/dataBoard/uface.png" />
-                <div>
-                  <p class="num" style="color: #5181f6">{{ ufaceList.length }}</p>
-                  <p>
-                    <!-- 人脸闸机总数 -->
-                    {{ $t('message.dataBoard.ufaceDev') }}
-                  </p>
-                </div>
-              </div>
-              <div class="item">
-                <img src="@/assets/images/dataBoard/inpeople.png" />
-                <div>
-                  <p class="num" style="color: #f67f51">{{ ufaceInCount }}</p>
-                  <p>
-                    <!-- 今日进场人数 -->
-                    {{ $t('message.dataBoard.todayInPeople') }}
-                  </p>
-                </div>
-              </div>
-              <div class="list-box">
-                <vue-scroll>
-                  <div
-                    class="list-item"
-                    :class="item.deviceState == 2 ? 'offline' : 'online'"
-                    v-for="(item, index) in ufaceList"
-                    :key="index"
-                  >
-                    <span class="type" v-if="item.deviceState == 1">在线</span>
-                    <span class="type" v-else>离线</span>
-                    <p>{{ item.devName }}</p>
-                    <span class="inNum">进场人数:{{ item.inTotalNum }}</span>
-                    <span class="outNum">出场人数:{{ item.outTotalNum }}</span>
-                  </div>
-                </vue-scroll>
-              </div>
-            </div>
-          </div>
-        </div>
+        <DataCard
+          :data="{
+            title: 'companyDiagram.ufaceDev',
+            countNum: ufaceList.length,
+            countLabel: 'ufaceDev',
+            countImg: require('@/assets/images/dataBoard/uface.png'),
+            todayNum: ufaceInCount,
+            todayLabel: 'todayInPeople',
+            todayImg: require('@/assets/images/dataBoard/inpeople.png')
+          }"
+          :list="ufaceList"
+          type="face"
+        ></DataCard>
         <div class="blockBox">
           <!-- AI分析 -->
           <div class="blockTitle">{{ $t('message.companyDiagram.AIAnalysis') }}</div>