From 48843549cf7b1b372f95ff0c4bf62a4ee1a19f1f Mon Sep 17 00:00:00 2001
From: jiayu <zheng_jiayu1@163.com>
Date: Thu, 19 Sep 2024 13:46:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=AE=9A=E4=BD=8DGPS-?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=9B=B4=E6=A0=8F=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/api/smartSafeHat/smartSafeHat.js       |  3 ++-
 .../deviceCentral/deviceCentral.vue           | 27 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/assets/js/api/smartSafeHat/smartSafeHat.js b/src/assets/js/api/smartSafeHat/smartSafeHat.js
index 78e44cf1..92852f44 100644
--- a/src/assets/js/api/smartSafeHat/smartSafeHat.js
+++ b/src/assets/js/api/smartSafeHat/smartSafeHat.js
@@ -14,7 +14,8 @@ export const getWorkerListApi = data => get('/xmgl/workerInfo/selectWorkerInfoLi
 
 // 智能安全帽--查询绑定人员
 export const getWorkerInfoListApi = data => post('/xmgl/workerInfo/selectWorkerInfoList', data);
-
+// 智能安全帽--查询围栏
+export const getHatFenceListApi = data => get('/xmgl/safetyHatFence/list', data);
 // 智能安全帽--设备中台--分页查询记录信息
 export const getSafeHatEquipmentCentralPageApi = data => get('/xmgl/safetyHatDev/page',data);
 // 智能安全帽--设备中台--添加记录信息
diff --git a/src/views/projectFront/smartSafeHat/deviceCentral/deviceCentral.vue b/src/views/projectFront/smartSafeHat/deviceCentral/deviceCentral.vue
index 28b65c12..d412e4d8 100644
--- a/src/views/projectFront/smartSafeHat/deviceCentral/deviceCentral.vue
+++ b/src/views/projectFront/smartSafeHat/deviceCentral/deviceCentral.vue
@@ -45,6 +45,9 @@
         <el-table class="tables" :data="tableData">
           <el-table-column prop="workerName" align="center" label="人员名称" width="280"></el-table-column>
           <el-table-column prop="devSn" align="center" label="设备序号"></el-table-column>
+          <el-table-column prop="fenceName" label="围栏名称" align="center">
+            <template slot-scope="scope">{{ scope.row.fenceName || '-' }}</template>
+          </el-table-column>
           <el-table-column prop="enterpriseName" label="分包单位" align="center">
             <template slot-scope="scope">{{ scope.row.enterpriseName || '-' }}</template>
           </el-table-column>
@@ -83,6 +86,16 @@
           <el-form-item label="设备序号" prop="devSn">
             <el-input v-model="addEditForm.devSn" placeholder="请输入"></el-input>
           </el-form-item>
+          <el-form-item
+            label="围栏名称"
+            prop="fenceId"
+          >
+          <el-select v-model="addEditForm.fenceId" filterable placeholder="请选择围栏">
+            <el-option :label="item.fenceName" :value="item.id"
+              v-for="(item, index) in hatFenceList" :key="index">
+            </el-option>
+          </el-select>
+          </el-form-item>
           <el-form-item
             label="分包单位"
             prop="enterpriseIds"
@@ -115,6 +128,7 @@ import {
   editSafeHatEquipmentCentralPageApi,
   deleteSafeHatEquipmentCentralPageApi,
   getWorkerInfoListApi,
+  getHatFenceListApi,
 } from '@/assets/js/api/smartSafeHat/smartSafeHat.js'
 import { getEnterpriseInfoListApi } from "@/assets/js/api/specialWork";
 export default {
@@ -123,6 +137,7 @@ export default {
     this.getEnterpriseList();
     this.getPage()
     this.getWorkerInfoList()
+    this.getHatFenceList()
   },
   computed: {
     headers() {
@@ -153,6 +168,7 @@ export default {
       },
       searchForm: {},
       fileList: [],
+      hatFenceList: []
     }
   },
   methods: {
@@ -236,7 +252,16 @@ export default {
         }
       })
     },
-
+    // 获取围栏列表
+    async getHatFenceList() {
+      await getHatFenceListApi({
+        projectSn: this.$store.state.projectSn,
+      }).then((result) => {
+        if (result.success) {
+          this.hatFenceList = result.result
+        }
+      })
+    },
     add() {
       this.title = '新增'
       this.dialogShow = true