From f869ec125c69bcc7f01fd77b106c801f0d3beb95 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 23 Aug 2024 14:09:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=BD=E5=B7=A5=E7=AE=A1=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/construction/manage/personManage.js   |  9 +++++
 .../manage/personManage/personManage.vue      | 40 +++++++++++++++----
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/src/api/construction/manage/personManage.js b/src/api/construction/manage/personManage.js
index d470198..7093550 100644
--- a/src/api/construction/manage/personManage.js
+++ b/src/api/construction/manage/personManage.js
@@ -69,4 +69,13 @@ export function getHistoryGj(query) {
         method: 'get',
         params: query
     })
+}
+
+/* 今日施工班组/施工人数/安全帽信息 */
+export function getWorkInfo(query) {
+    return request({
+        url: '/bracelet/consControl/getWorkInfo',
+        method: 'get',
+        params: query
+    })
 }
\ No newline at end of file
diff --git a/src/views/construction/manage/personManage/personManage.vue b/src/views/construction/manage/personManage/personManage.vue
index a6c3d89..bb095c0 100644
--- a/src/views/construction/manage/personManage/personManage.vue
+++ b/src/views/construction/manage/personManage/personManage.vue
@@ -111,7 +111,8 @@
     </div>
 
 
-    <el-dialog title="选择抽检范围" :visible.sync="dialogVisible1" :append-to-body="true" width="500px" @close="dialogVisible1 = false">
+    <el-dialog title="选择抽检范围" :visible.sync="dialogVisible1" :append-to-body="true" width="500px"
+      @close="dialogVisible1 = false">
       <el-input placeholder="请输入关键字" prefix-icon="el-icon-search" v-model="filterText2" maxlength="30"
         style="margin-bottom: 10px;"></el-input>
       <el-tree :data="teamTreeData" class="tree-container tree" icon="el-icon-search" show-checkbox node-key="id"
@@ -124,7 +125,8 @@
     </el-dialog>
 
 
-    <el-dialog title="自动验证人脸配置" :visible.sync="dialogVisible2" :append-to-body="true" width="500px" @close="closeTimeConfig">
+    <el-dialog title="自动验证人脸配置" :visible.sync="dialogVisible2" :append-to-body="true" width="500px"
+      @close="closeTimeConfig">
       <el-form ref="form" :model="form" :label-position="labelPosition" :rules="rules">
         <el-form-item label="模式选择">
           <el-radio-group v-model="form.configType">
@@ -174,7 +176,7 @@
 </template>
 
 <script>
-import { personsTree, teamPersonByTower, spotCheck, getCheckConfig, checkConfig, getPersonsInfo, getPersonDetail, getHistoryGj } from "@/api/construction/manage/personManage.js";
+import { personsTree, teamPersonByTower, spotCheck, getCheckConfig, checkConfig, getPersonsInfo, getPersonDetail, getHistoryGj, getWorkInfo } from "@/api/construction/manage/personManage.js";
 import no_warn from "@/assets/svg/no_warn.svg";
 import no_warn2 from "@/assets/svg/no_warn2.svg";
 import warn from "@/assets/svg/warn.svg";
@@ -322,6 +324,17 @@ export default {
       let date = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2);
       return date;
     },
+    /* 今日施工班组/施工人数/安全帽信息 */
+    loadWorkInfo() {
+      const query = {
+        id: this.towerId
+      }
+      getWorkInfo(query).then((res) => {
+        const data = res.data;
+        this.person.workTeamNum = data.workTeamNum;
+        this.person.workPersonNum = data.workPersonNum;;
+      }).catch((res) => { })
+    },
     /* 加载人员树 */
     getPersonsTree() {
       personsTree().then(res => {
@@ -490,7 +503,7 @@ export default {
           const lat = data.towerInfo.lat;
           this.circleRange.center.lng = lon;
           this.circleRange.center.lat = lat;
-          this.circleRange.radius = data.distance
+          this.circleRange.radius = data.towerInfo.distance
           // 根据杆塔坐标 重新定义中心点 并绘制施工半径
           const point = new BMap.Point(lon, lat);
           this.map.centerAndZoom(point, this.zoom);
@@ -582,6 +595,7 @@ export default {
         this.isTower = true;
         this.isTeam = false;
         this.isPerson = false;
+        this.loadWorkInfo();
       } else if ((node.level === 3)) {
         // 选中班组层级 触发事件 id:杆塔ID teamId:班组ID
         this.isTower = false;
@@ -631,14 +645,18 @@ export default {
           overlay.setIcon(myIcon);
         }
       }
+      let isExist = false;
       for (let index = 0; index < allOverlay.length; index++) {
         let overlay = allOverlay[index];
         // 判断是否是点的覆盖物
         const flag = this.isOverlayPoint(overlay);
-        if (flag && ("marker-" + item.type + '-' + item.id === overlay.id) && item.isWarn === 0) {
-          let myIcon = new BMap.Icon(no_warn2, new BMap.Size(50, 50))
-          myIcon.setImageSize(new BMap.Size(50, 50));
-          overlay.setIcon(myIcon);
+        if (flag && ("marker-" + item.type + '-' + item.id === overlay.id)) {
+          if (item.isWarn === 0) {
+            let myIcon = new BMap.Icon(no_warn2, new BMap.Size(50, 50))
+            myIcon.setImageSize(new BMap.Size(50, 50));
+            overlay.setIcon(myIcon);
+          }
+          isExist = true;
         }
       }
       this.isTower = false;
@@ -650,6 +668,12 @@ export default {
         'type': item.type
       }
       this.loadPersonDetail(obj);
+      if (!isExist) {
+        return this.$message({
+          message: item.label + '无定位坐标',
+          type: 'error'
+        });
+      }
     },
     /* 添加人员定位的覆盖物 */
     addPersonMarker(item) {