From 6b697f65a3d7f5c860e7682652fbf26a7146cec9 Mon Sep 17 00:00:00 2001
From: Jack <1638169491@qq.com>
Date: Tue, 16 Aug 2022 10:03:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=E8=80=81=E7=89=88=E6=95=B0?=
 =?UTF-8?q?=E5=AD=97=E5=B7=A5=E5=9C=B0=E4=BA=BA=E8=84=B8=E9=97=B8=E6=9C=BA?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataBoard/digitalSite/center/FaceGate.vue |  2 +-
 .../dataBoard/digitalSite/index.vue           | 28 ++++---------------
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/src/views/projectAdmin/dataBoard/digitalSite/center/FaceGate.vue b/src/views/projectAdmin/dataBoard/digitalSite/center/FaceGate.vue
index 42672534..b37683d5 100644
--- a/src/views/projectAdmin/dataBoard/digitalSite/center/FaceGate.vue
+++ b/src/views/projectAdmin/dataBoard/digitalSite/center/FaceGate.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="faceGate">
-    <div class="faceDevBox pointDialog_s" :style="{ left: data.x, top: data.y }">
+    <div class="faceDevBox pointDialog_s">
       <div class="title">
         {{ data.name }}
         <span class="closeBtn" @click="close">
diff --git a/src/views/projectAdmin/dataBoard/digitalSite/index.vue b/src/views/projectAdmin/dataBoard/digitalSite/index.vue
index 0c345281..d4e73827 100644
--- a/src/views/projectAdmin/dataBoard/digitalSite/index.vue
+++ b/src/views/projectAdmin/dataBoard/digitalSite/index.vue
@@ -140,11 +140,7 @@
               <div class="devName">{{ item.name }}</div>
             </div>
             <!-- 人脸闸机弹框 -->
-            <FaceGate
-              v-if="showFaceDevDialog"
-              :close="() => (showFaceDevDialog = false)"
-              :data="{ ...faceDevDialogData, ...faceDevDetail }"
-            ></FaceGate>
+            <FaceGate v-if="showFaceDevDialog" :close="() => (showFaceDevDialog = false)" :data="{ ...faceDevDialogData }"></FaceGate>
             <!-- 环境设备弹框 -->
             <div class="environBox pointDialog_s" v-show="showEnvironDialog" :style="{ left: environBoxPos.x, top: environBoxPos.y }">
               <!-- 实时数据 -->
@@ -2265,7 +2261,6 @@ export default {
       },
       showVideoDialog: false,
       showVideoDialog2: false,
-      faceDevDetail: { name: '', devSn: '', x: 0, y: 0 },
       showFaceDevDialog: false,
       faceDevDialogData: {
         list: [],
@@ -2395,7 +2390,6 @@ export default {
     }
     this.getDevTypeFn()
     this.getDevList()
-    this.selectWorkerAttendanceByDev()
     this.pieAnalyse()
     this.countBoxSize()
   },
@@ -3037,19 +3031,8 @@ export default {
           this.getRealTimeDustNoiseData(item.devSn)
           break
         case 7:
-          this.faceDevDetail = item
-          if (parseFloat(item.mapY) > 650) {
-            this.faceDevDetail.y = parseFloat(item.mapY) - 100 + 'px'
-          } else {
-            this.faceDevDetail.y = parseFloat(item.mapY) + 0 + 'px'
-          }
-          if (parseFloat(item.mapX) / this.imgWidthScale > 630) {
-            this.faceDevDetail.x = parseFloat(item.mapX) / this.imgWidthScale - 150 + 'px'
-          } else {
-            this.faceDevDetail.x = parseFloat(item.mapX) / this.imgWidthScale + 50 + 'px'
-          }
           this.showFaceDevDialog = true
-          this.selectWorkerAttendanceByDev()
+          this.selectWorkerAttendanceByDev(item)
           break
         //龙门吊
         case 9:
@@ -3290,13 +3273,12 @@ export default {
       })
     },
     //获取人脸闸机数据
-    selectWorkerAttendanceByDev() {
+    selectWorkerAttendanceByDev({ devSn, name }) {
       selectWorkerAttendanceByDevApi({
         projectSn: this.projectSn,
-        devSn: this.faceDevDetail.devSn
+        devSn
       }).then(res => {
-        this.faceDevDialogData = res.result
-        console.log(this.faceDevDialogData)
+        this.faceDevDialogData = { ...res.result, name }
       })
     },
     //获取电箱设备的实时数据