diff --git a/src/api/person.ts b/src/api/person.ts
new file mode 100644
index 0000000..6593ccf
--- /dev/null
+++ b/src/api/person.ts
@@ -0,0 +1,45 @@
+/**
+ * 人员管理接口
+ */
+import request from './index'
+const prefix = 'worker'
+// 图片上传接口
+export function uploadApi(data: FormData) {
+  return request({
+    url: 'file/upload',
+    method: 'post',
+    data,
+  })
+}
+// 人员列表
+export function getPersonListPage(params: object) {
+  return request({
+    url: `${prefix}/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 更新人员
+export function updatePerson(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function addPerson(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function delPerson(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/person.ts b/src/api/person.ts
new file mode 100644
index 0000000..6593ccf
--- /dev/null
+++ b/src/api/person.ts
@@ -0,0 +1,45 @@
+/**
+ * 人员管理接口
+ */
+import request from './index'
+const prefix = 'worker'
+// 图片上传接口
+export function uploadApi(data: FormData) {
+  return request({
+    url: 'file/upload',
+    method: 'post',
+    data,
+  })
+}
+// 人员列表
+export function getPersonListPage(params: object) {
+  return request({
+    url: `${prefix}/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 更新人员
+export function updatePerson(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function addPerson(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function delPerson(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/person.ts b/src/router/modules/person.ts
index 5366ecc..4a28d39 100644
--- a/src/router/modules/person.ts
+++ b/src/router/modules/person.ts
@@ -31,7 +31,7 @@
         name: 'personedit',
         component: () => import('@/views/person/personEdit.vue'),
         meta: {
-          title: '人员编辑/:id?',
+          title: '人员编辑/:type?',
           auth: '/person',
           sidebar: false,
           breadcrumb: true,

diff --git a/src/api/person.ts b/src/api/person.ts
new file mode 100644
index 0000000..6593ccf
--- /dev/null
+++ b/src/api/person.ts
@@ -0,0 +1,45 @@
+/**
+ * 人员管理接口
+ */
+import request from './index'
+const prefix = 'worker'
+// 图片上传接口
+export function uploadApi(data: FormData) {
+  return request({
+    url: 'file/upload',
+    method: 'post',
+    data,
+  })
+}
+// 人员列表
+export function getPersonListPage(params: object) {
+  return request({
+    url: `${prefix}/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 更新人员
+export function updatePerson(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function addPerson(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function delPerson(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/person.ts b/src/router/modules/person.ts
index 5366ecc..4a28d39 100644
--- a/src/router/modules/person.ts
+++ b/src/router/modules/person.ts
@@ -31,7 +31,7 @@
         name: 'personedit',
         component: () => import('@/views/person/personEdit.vue'),
         meta: {
-          title: '人员编辑/:id?',
+          title: '人员编辑/:type?',
           auth: '/person',
           sidebar: false,
           breadcrumb: true,
diff --git a/src/views/device/device-interface.ts b/src/views/device/device-interface.ts
index 8e3d5f9..9205bc0 100644
--- a/src/views/device/device-interface.ts
+++ b/src/views/device/device-interface.ts
@@ -6,4 +6,10 @@
   id?: string
   isPowerSupply: string
   manufacturer: string
+  cameraIp?: string // 摄像头ip
+  cameraPort?: string // 摄像头端口
+  cameraCode?: string // 摄像头编号
+  gasCode?: string // 激甲编号
+  gasIp?: string // 激甲ip
+  gasPort?: string // 激甲端口
 }

diff --git a/src/api/person.ts b/src/api/person.ts
new file mode 100644
index 0000000..6593ccf
--- /dev/null
+++ b/src/api/person.ts
@@ -0,0 +1,45 @@
+/**
+ * 人员管理接口
+ */
+import request from './index'
+const prefix = 'worker'
+// 图片上传接口
+export function uploadApi(data: FormData) {
+  return request({
+    url: 'file/upload',
+    method: 'post',
+    data,
+  })
+}
+// 人员列表
+export function getPersonListPage(params: object) {
+  return request({
+    url: `${prefix}/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 更新人员
+export function updatePerson(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function addPerson(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function delPerson(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/person.ts b/src/router/modules/person.ts
index 5366ecc..4a28d39 100644
--- a/src/router/modules/person.ts
+++ b/src/router/modules/person.ts
@@ -31,7 +31,7 @@
         name: 'personedit',
         component: () => import('@/views/person/personEdit.vue'),
         meta: {
-          title: '人员编辑/:id?',
+          title: '人员编辑/:type?',
           auth: '/person',
           sidebar: false,
           breadcrumb: true,
diff --git a/src/views/device/device-interface.ts b/src/views/device/device-interface.ts
index 8e3d5f9..9205bc0 100644
--- a/src/views/device/device-interface.ts
+++ b/src/views/device/device-interface.ts
@@ -6,4 +6,10 @@
   id?: string
   isPowerSupply: string
   manufacturer: string
+  cameraIp?: string // 摄像头ip
+  cameraPort?: string // 摄像头端口
+  cameraCode?: string // 摄像头编号
+  gasCode?: string // 激甲编号
+  gasIp?: string // 激甲ip
+  gasPort?: string // 激甲端口
 }
diff --git a/src/views/device/deviceEdit.vue b/src/views/device/deviceEdit.vue
index e3f70cb..63d1474 100644
--- a/src/views/device/deviceEdit.vue
+++ b/src/views/device/deviceEdit.vue
@@ -23,6 +23,13 @@
   manufacturer: '', // 厂家
   id: '',
   createTime: '',
+  cameraIp: '', // 摄像头ip
+  cameraPort: '', // 摄像头端口
+  cameraCode: '', // 摄像头编号
+  gasCode: '', // 激甲编号
+  gasIp: '', // 激甲ip
+  gasPort: '', // 激甲端口
+
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -35,6 +42,10 @@
   deviceBatch: [{ required: true, message: '请输入设备批次', trigger: ['blur', 'change'] }],
   isPowerSupply: [{ required: true, message: '请输入设备是否供电', trigger: ['blur', 'change'] }],
   manufacturer: [{ required: true, message: '请输入设备厂家', trigger: ['blur', 'change'] }],
+  cameraPort: [{ required: true, message: '请输入摄像头端口号', trigger: ['blur', 'change'] }],
+  cameraIp: [{ required: true, message: '请输入摄像头ip', trigger: ['blur', 'change'] }],
+  gasIp: [{ required: true, message: '请输入激甲ip', trigger: ['blur', 'change'] }],
+  gasPort: [{ required: true, message: '请输入激甲端口号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -47,8 +58,14 @@
     manufacturer: '', // 厂家
     id: '',
     createTime: '',
+    cameraIp: '', // 摄像头ip
+    cameraPort: '', // 摄像头端口
+    cameraCode: '', // 摄像头编号
+    gasCode: '', // 激甲编号
+    gasIp: '', // 激甲ip
+    gasPort: '', // 激甲端口
   }
-  dataFormRef.value.clearValidate()
+  // dataFormRef.value.clearValidate()
 }
 // 获取设备类型
 const deviceTypeList = ref()
@@ -73,7 +90,6 @@
   dialogFormVisible.value = true
   btnLoading.value = false
   if (dialogStatus.value === 'create') { // 如果是新增，清除验证
-    console.log('新增')
     resetForm()
     isEditMode.value = false
     nextTick(() => {
@@ -81,7 +97,6 @@
     })
   }
   else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
-    console.log('编辑')
     deviceForm.value = {
       deviceType: row.deviceType, // 设备类型
       deviceCode: row.deviceCode, // 设备编号
@@ -90,6 +105,12 @@
       manufacturer: row.manufacturer, // 厂家
       id: row.id,
       createTime: row.createTime,
+      cameraIp: row.cameraIp, // 摄像头ip
+      cameraPort: row.cameraPort, // 摄像头端口
+      cameraCode: row.cameraCode, // 摄像头编号
+      gasCode: row.gasCode, // 激甲编号
+      gasIp: row.gasIp, // 激甲ip
+      gasPort: row.gasPort, // 激甲端口
     }
     isEditMode.value = true
   }
@@ -162,11 +183,20 @@
   dialogFormVisible.value = false
   resetForm()
 }
+// 是否安全帽
+const isANQUANMAO = computed(() => {
+  if (deviceTypeList.value.length) {
+    return deviceTypeList.value.filter((item: any) => item.value === deviceForm.value.deviceType)[0]?.name === '安全树'
+  }
+  else {
+    return false
+  }
+})
 </script>
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
-    <el-form ref="dataFormRef" :rules="rules" :model="deviceForm" label-position="right" label-width="80px">
+    <el-form ref="dataFormRef" :rules="rules" :model="deviceForm" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
@@ -203,6 +233,30 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row v-if="isANQUANMAO" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="激光甲烷IP" prop="gasIp">
+            <el-input v-model.trim="deviceForm.gasIp" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="激光甲烷端口" prop="gasPort">
+            <el-input v-model.trim="deviceForm.gasPort" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isANQUANMAO" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="摄像头IP" prop="cameraIp">
+            <el-input v-model.trim="deviceForm.cameraIp" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="摄像头端口" prop="cameraPort">
+            <el-input v-model.trim="deviceForm.cameraPort" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <div class="dialog-footer">

diff --git a/src/api/person.ts b/src/api/person.ts
new file mode 100644
index 0000000..6593ccf
--- /dev/null
+++ b/src/api/person.ts
@@ -0,0 +1,45 @@
+/**
+ * 人员管理接口
+ */
+import request from './index'
+const prefix = 'worker'
+// 图片上传接口
+export function uploadApi(data: FormData) {
+  return request({
+    url: 'file/upload',
+    method: 'post',
+    data,
+  })
+}
+// 人员列表
+export function getPersonListPage(params: object) {
+  return request({
+    url: `${prefix}/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 更新人员
+export function updatePerson(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function addPerson(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function delPerson(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/person.ts b/src/router/modules/person.ts
index 5366ecc..4a28d39 100644
--- a/src/router/modules/person.ts
+++ b/src/router/modules/person.ts
@@ -31,7 +31,7 @@
         name: 'personedit',
         component: () => import('@/views/person/personEdit.vue'),
         meta: {
-          title: '人员编辑/:id?',
+          title: '人员编辑/:type?',
           auth: '/person',
           sidebar: false,
           breadcrumb: true,
diff --git a/src/views/device/device-interface.ts b/src/views/device/device-interface.ts
index 8e3d5f9..9205bc0 100644
--- a/src/views/device/device-interface.ts
+++ b/src/views/device/device-interface.ts
@@ -6,4 +6,10 @@
   id?: string
   isPowerSupply: string
   manufacturer: string
+  cameraIp?: string // 摄像头ip
+  cameraPort?: string // 摄像头端口
+  cameraCode?: string // 摄像头编号
+  gasCode?: string // 激甲编号
+  gasIp?: string // 激甲ip
+  gasPort?: string // 激甲端口
 }
diff --git a/src/views/device/deviceEdit.vue b/src/views/device/deviceEdit.vue
index e3f70cb..63d1474 100644
--- a/src/views/device/deviceEdit.vue
+++ b/src/views/device/deviceEdit.vue
@@ -23,6 +23,13 @@
   manufacturer: '', // 厂家
   id: '',
   createTime: '',
+  cameraIp: '', // 摄像头ip
+  cameraPort: '', // 摄像头端口
+  cameraCode: '', // 摄像头编号
+  gasCode: '', // 激甲编号
+  gasIp: '', // 激甲ip
+  gasPort: '', // 激甲端口
+
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -35,6 +42,10 @@
   deviceBatch: [{ required: true, message: '请输入设备批次', trigger: ['blur', 'change'] }],
   isPowerSupply: [{ required: true, message: '请输入设备是否供电', trigger: ['blur', 'change'] }],
   manufacturer: [{ required: true, message: '请输入设备厂家', trigger: ['blur', 'change'] }],
+  cameraPort: [{ required: true, message: '请输入摄像头端口号', trigger: ['blur', 'change'] }],
+  cameraIp: [{ required: true, message: '请输入摄像头ip', trigger: ['blur', 'change'] }],
+  gasIp: [{ required: true, message: '请输入激甲ip', trigger: ['blur', 'change'] }],
+  gasPort: [{ required: true, message: '请输入激甲端口号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -47,8 +58,14 @@
     manufacturer: '', // 厂家
     id: '',
     createTime: '',
+    cameraIp: '', // 摄像头ip
+    cameraPort: '', // 摄像头端口
+    cameraCode: '', // 摄像头编号
+    gasCode: '', // 激甲编号
+    gasIp: '', // 激甲ip
+    gasPort: '', // 激甲端口
   }
-  dataFormRef.value.clearValidate()
+  // dataFormRef.value.clearValidate()
 }
 // 获取设备类型
 const deviceTypeList = ref()
@@ -73,7 +90,6 @@
   dialogFormVisible.value = true
   btnLoading.value = false
   if (dialogStatus.value === 'create') { // 如果是新增，清除验证
-    console.log('新增')
     resetForm()
     isEditMode.value = false
     nextTick(() => {
@@ -81,7 +97,6 @@
     })
   }
   else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
-    console.log('编辑')
     deviceForm.value = {
       deviceType: row.deviceType, // 设备类型
       deviceCode: row.deviceCode, // 设备编号
@@ -90,6 +105,12 @@
       manufacturer: row.manufacturer, // 厂家
       id: row.id,
       createTime: row.createTime,
+      cameraIp: row.cameraIp, // 摄像头ip
+      cameraPort: row.cameraPort, // 摄像头端口
+      cameraCode: row.cameraCode, // 摄像头编号
+      gasCode: row.gasCode, // 激甲编号
+      gasIp: row.gasIp, // 激甲ip
+      gasPort: row.gasPort, // 激甲端口
     }
     isEditMode.value = true
   }
@@ -162,11 +183,20 @@
   dialogFormVisible.value = false
   resetForm()
 }
+// 是否安全帽
+const isANQUANMAO = computed(() => {
+  if (deviceTypeList.value.length) {
+    return deviceTypeList.value.filter((item: any) => item.value === deviceForm.value.deviceType)[0]?.name === '安全树'
+  }
+  else {
+    return false
+  }
+})
 </script>
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
-    <el-form ref="dataFormRef" :rules="rules" :model="deviceForm" label-position="right" label-width="80px">
+    <el-form ref="dataFormRef" :rules="rules" :model="deviceForm" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
@@ -203,6 +233,30 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row v-if="isANQUANMAO" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="激光甲烷IP" prop="gasIp">
+            <el-input v-model.trim="deviceForm.gasIp" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="激光甲烷端口" prop="gasPort">
+            <el-input v-model.trim="deviceForm.gasPort" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isANQUANMAO" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="摄像头IP" prop="cameraIp">
+            <el-input v-model.trim="deviceForm.cameraIp" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="摄像头端口" prop="cameraPort">
+            <el-input v-model.trim="deviceForm.cameraPort" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index fc0240c..0fcc508 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -17,12 +17,12 @@
   deviceCode: '',
   deviceType: '',
   offset: 1,
-  limit: 20,
+  limit: 5,
 })
 const columns = ref<TableColumn[]>([
   {
     text: '设备类型',
-    value: 'deviceType',
+    value: 'deviceTypeName',
     align: 'center',
     // width: 170,
   },
@@ -39,7 +39,7 @@
   },
   {
     text: '是否供电',
-    value: 'isPowerSupply',
+    value: 'isPowerSupplyName',
     align: 'center',
   },
   {
@@ -54,7 +54,7 @@
   },
   {
     text: '当前状态',
-    value: '7',
+    value: 'statusName',
     align: 'center',
   },
 ])
@@ -142,6 +142,7 @@
   <div class="list-log">
     <!-- 布局 -->
     <app-container>
+      <!-- 人员编辑 -->
       <edit-list ref="editRef" @watch-child="search" />
       <!-- 筛选条件 -->
       <search-area @search="search">

diff --git a/src/api/person.ts b/src/api/person.ts
new file mode 100644
index 0000000..6593ccf
--- /dev/null
+++ b/src/api/person.ts
@@ -0,0 +1,45 @@
+/**
+ * 人员管理接口
+ */
+import request from './index'
+const prefix = 'worker'
+// 图片上传接口
+export function uploadApi(data: FormData) {
+  return request({
+    url: 'file/upload',
+    method: 'post',
+    data,
+  })
+}
+// 人员列表
+export function getPersonListPage(params: object) {
+  return request({
+    url: `${prefix}/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 更新人员
+export function updatePerson(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function addPerson(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function delPerson(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/person.ts b/src/router/modules/person.ts
index 5366ecc..4a28d39 100644
--- a/src/router/modules/person.ts
+++ b/src/router/modules/person.ts
@@ -31,7 +31,7 @@
         name: 'personedit',
         component: () => import('@/views/person/personEdit.vue'),
         meta: {
-          title: '人员编辑/:id?',
+          title: '人员编辑/:type?',
           auth: '/person',
           sidebar: false,
           breadcrumb: true,
diff --git a/src/views/device/device-interface.ts b/src/views/device/device-interface.ts
index 8e3d5f9..9205bc0 100644
--- a/src/views/device/device-interface.ts
+++ b/src/views/device/device-interface.ts
@@ -6,4 +6,10 @@
   id?: string
   isPowerSupply: string
   manufacturer: string
+  cameraIp?: string // 摄像头ip
+  cameraPort?: string // 摄像头端口
+  cameraCode?: string // 摄像头编号
+  gasCode?: string // 激甲编号
+  gasIp?: string // 激甲ip
+  gasPort?: string // 激甲端口
 }
diff --git a/src/views/device/deviceEdit.vue b/src/views/device/deviceEdit.vue
index e3f70cb..63d1474 100644
--- a/src/views/device/deviceEdit.vue
+++ b/src/views/device/deviceEdit.vue
@@ -23,6 +23,13 @@
   manufacturer: '', // 厂家
   id: '',
   createTime: '',
+  cameraIp: '', // 摄像头ip
+  cameraPort: '', // 摄像头端口
+  cameraCode: '', // 摄像头编号
+  gasCode: '', // 激甲编号
+  gasIp: '', // 激甲ip
+  gasPort: '', // 激甲端口
+
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -35,6 +42,10 @@
   deviceBatch: [{ required: true, message: '请输入设备批次', trigger: ['blur', 'change'] }],
   isPowerSupply: [{ required: true, message: '请输入设备是否供电', trigger: ['blur', 'change'] }],
   manufacturer: [{ required: true, message: '请输入设备厂家', trigger: ['blur', 'change'] }],
+  cameraPort: [{ required: true, message: '请输入摄像头端口号', trigger: ['blur', 'change'] }],
+  cameraIp: [{ required: true, message: '请输入摄像头ip', trigger: ['blur', 'change'] }],
+  gasIp: [{ required: true, message: '请输入激甲ip', trigger: ['blur', 'change'] }],
+  gasPort: [{ required: true, message: '请输入激甲端口号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -47,8 +58,14 @@
     manufacturer: '', // 厂家
     id: '',
     createTime: '',
+    cameraIp: '', // 摄像头ip
+    cameraPort: '', // 摄像头端口
+    cameraCode: '', // 摄像头编号
+    gasCode: '', // 激甲编号
+    gasIp: '', // 激甲ip
+    gasPort: '', // 激甲端口
   }
-  dataFormRef.value.clearValidate()
+  // dataFormRef.value.clearValidate()
 }
 // 获取设备类型
 const deviceTypeList = ref()
@@ -73,7 +90,6 @@
   dialogFormVisible.value = true
   btnLoading.value = false
   if (dialogStatus.value === 'create') { // 如果是新增，清除验证
-    console.log('新增')
     resetForm()
     isEditMode.value = false
     nextTick(() => {
@@ -81,7 +97,6 @@
     })
   }
   else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
-    console.log('编辑')
     deviceForm.value = {
       deviceType: row.deviceType, // 设备类型
       deviceCode: row.deviceCode, // 设备编号
@@ -90,6 +105,12 @@
       manufacturer: row.manufacturer, // 厂家
       id: row.id,
       createTime: row.createTime,
+      cameraIp: row.cameraIp, // 摄像头ip
+      cameraPort: row.cameraPort, // 摄像头端口
+      cameraCode: row.cameraCode, // 摄像头编号
+      gasCode: row.gasCode, // 激甲编号
+      gasIp: row.gasIp, // 激甲ip
+      gasPort: row.gasPort, // 激甲端口
     }
     isEditMode.value = true
   }
@@ -162,11 +183,20 @@
   dialogFormVisible.value = false
   resetForm()
 }
+// 是否安全帽
+const isANQUANMAO = computed(() => {
+  if (deviceTypeList.value.length) {
+    return deviceTypeList.value.filter((item: any) => item.value === deviceForm.value.deviceType)[0]?.name === '安全树'
+  }
+  else {
+    return false
+  }
+})
 </script>
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
-    <el-form ref="dataFormRef" :rules="rules" :model="deviceForm" label-position="right" label-width="80px">
+    <el-form ref="dataFormRef" :rules="rules" :model="deviceForm" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
@@ -203,6 +233,30 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row v-if="isANQUANMAO" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="激光甲烷IP" prop="gasIp">
+            <el-input v-model.trim="deviceForm.gasIp" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="激光甲烷端口" prop="gasPort">
+            <el-input v-model.trim="deviceForm.gasPort" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isANQUANMAO" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="摄像头IP" prop="cameraIp">
+            <el-input v-model.trim="deviceForm.cameraIp" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="摄像头端口" prop="cameraPort">
+            <el-input v-model.trim="deviceForm.cameraPort" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index fc0240c..0fcc508 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -17,12 +17,12 @@
   deviceCode: '',
   deviceType: '',
   offset: 1,
-  limit: 20,
+  limit: 5,
 })
 const columns = ref<TableColumn[]>([
   {
     text: '设备类型',
-    value: 'deviceType',
+    value: 'deviceTypeName',
     align: 'center',
     // width: 170,
   },
@@ -39,7 +39,7 @@
   },
   {
     text: '是否供电',
-    value: 'isPowerSupply',
+    value: 'isPowerSupplyName',
     align: 'center',
   },
   {
@@ -54,7 +54,7 @@
   },
   {
     text: '当前状态',
-    value: '7',
+    value: 'statusName',
     align: 'center',
   },
 ])
@@ -142,6 +142,7 @@
   <div class="list-log">
     <!-- 布局 -->
     <app-container>
+      <!-- 人员编辑 -->
       <edit-list ref="editRef" @watch-child="search" />
       <!-- 筛选条件 -->
       <search-area @search="search">
diff --git a/src/views/person/index.vue b/src/views/person/index.vue
index 75f6b22..f36b253 100644
--- a/src/views/person/index.vue
+++ b/src/views/person/index.vue
@@ -6,11 +6,19 @@
 <script lang="ts" setup name="person">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import type { dict } from './person-interface'
+import { delPerson, getPersonListPage } from '@/api/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getDictByCode } from '@/api/system/dict'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  beginTime: '',
-  endTime: '',
+  name: '',
+  startDate: '',
+  status: '',
+  deptId: '',
+  endDate: '',
   // logType: '业务日志',
   offset: 1,
   limit: 20,
@@ -18,115 +26,58 @@
 const columns = ref([
   {
     text: '姓名',
-    value: '1',
+    value: 'workerName',
     align: 'center',
     // width: 170,
   },
   {
     text: '性别',
-    value: '2',
+    value: 'genderName',
     align: 'center',
     // width: 100,
   },
   {
     text: '联系方式',
-    value: '3',
+    value: 'phoneNumber',
     align: 'center',
   },
   {
     text: '所属部门',
-    value: '4',
+    value: 'deptName',
     align: 'center',
   },
   {
     text: '注册时间',
-    value: '5',
+    value: 'createTime',
     align: 'center',
   },
   {
     text: '当前状态',
-    value: '6',
+    value: 'statusName',
     align: 'center',
   },
 ])
 const list = ref([])
 const total = ref(20)
-const logTypeList = ref(null)
 const listLoading = ref(true)
-const dialogFormVisible = ref(false)
-const dialogStatus = ref('')
-// 获取日志数据
+// 获取列表
 const fetchData = () => {
   listLoading.value = true
-  // getBizLogList(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [
-    {
-      1: '张三',
-      2: '男',
-      3: '1370000000',
-      4: '生产部',
-      5: '2020-02-02',
-      6: '作业中',
-    },
-    {
-      1: '李四',
-      2: '女',
-      3: '1572000000',
-      4: '运维部',
-      5: '2021-01-01',
-      6: '正常',
-    },
-  ]
-  total.value = list.value.length
-  listLoading.value = false
-}
-
-fetchData()
-
-// 打开详情对话框
-// const detail = (row: any) => {
-//   getBizLogDetail(row.id).then((res) => {
-//     if (res.code === 200) {
-//       ElMessageBox.alert(res.data, '详情', {
-//         confirmButtonText: '确定',
-//       })
-//     }
-//   })
-// }
-
-// 清空日志
-const cleanAll = () => {
-  ElMessageBox.confirm('确定要清空全部日志吗？', '确认操作', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    // delLog().then((response) => {
-    //   if (response.code === 200) {
-    //     ElMessage({
-    //       message: '删除成功',
-    //       type: 'success',
-    //     })
-    //     list.value = []
-    //     total.value = 0
-    //     // this.fetchData()
-    //   }
-    // })
+  getPersonListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
   })
 }
 
+fetchData()
 // 查询数据
 const search = () => {
   fetchData()
 }
 // 新增人员
 const add = (row: any) => {
-  // personRef.value.initDialog('create')
-  $router.push({ path: '/person/personedit' })
+  $router.push({ path: '/person/personedit', query: { type: 'add' } })
 }
 // 人脸注册
 const register = (row: any) => {
@@ -134,14 +85,8 @@
 }
 // 编辑人员
 const edit = (row: any) => {
-  // personRef.value.initDialog('update', {})
+  $router.push({ path: '/person/personedit', query: { type: 'update', row: JSON.stringify(row) } })
 }
-// 获取日志类型
-// const fetchLogType = () => {
-//   getLogType().then((response) => {
-//     logTypeList.value = response.data
-//   })
-// }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
@@ -159,6 +104,50 @@
 const multiSelect = (row: any[]) => {
   selectList.value = row
 }
+// 删除
+const del = () => {
+  if (selectList.value.length) {
+    ElMessageBox.confirm('是否删除所选的数据?', '提示', {
+      confirmButtonText: '是',
+      cancelButtonText: '否',
+      type: 'info',
+    }).then((res) => {
+      // 点击确认
+      const ids = selectList.value.map(item => item.id)
+      delPerson(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
+    }).catch(() => {
+      // 点击取消
+      selectList.value = []
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+const deptTreeList = ref([])
+// 加载组织机构树形下拉
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+// 人员状态列表
+const workerStatusList = ref<dict[]>([])
+const fetchStatusList = () => {
+  getDictByCode('workerStatus').then((response) => {
+    workerStatusList.value = response.data
+  })
+}
+fetchStatusList()
+fetchDeptTree()
 </script>
 
 <template>
@@ -169,31 +158,29 @@
       <!-- 筛选条件 -->
       <search-area @search="search">
         <search-item>
-          <el-input v-model.trim="listQuery.beginTime" placeholder="姓名" clearable />
+          <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.beginTime" clearable placeholder="所属部门">
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value"></el-option>
+          <dept-select v-model="listQuery.deptId" :data="deptTreeList" placeholder="所属部门" style="width: 100%;" />
+        </search-item>
+        <search-item>
+          <el-select v-model="listQuery.status" clearable placeholder="当前状态">
+            <el-option v-for="item in workerStatusList" :key="item.id" :label="item.name" :value="item.value"></el-option>
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.beginTime" clearable placeholder="当前状态">
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value"></el-option>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-date-picker v-model="listQuery.beginTime" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
+          <el-date-picker v-model="listQuery.startDate" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="注册开始时间" />
         </search-item>
         <search-item>
-          <el-date-picker v-model="listQuery.endTime" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
+          <el-date-picker v-model="listQuery.endDate" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="注册结束时间" />
         </search-item>
         <template #btns>
           <el-button class="search-btn" type="primary" @click="add">
             新增
           </el-button>
-          <el-button class="search-btn" type="info" >
+          <el-button class="search-btn" type="info" @click="del">
             删除
           </el-button>
         </template>
@@ -205,7 +192,7 @@
           <template #columns>
             <el-table-column label="人脸注册" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="register(scope.row)">
+                <el-button link type="primary" :disabled="scope.row.workerAvatar" size="small" @click="register(scope.row)">
                   注册
                 </el-button>
               </template>

diff --git a/src/api/person.ts b/src/api/person.ts
new file mode 100644
index 0000000..6593ccf
--- /dev/null
+++ b/src/api/person.ts
@@ -0,0 +1,45 @@
+/**
+ * 人员管理接口
+ */
+import request from './index'
+const prefix = 'worker'
+// 图片上传接口
+export function uploadApi(data: FormData) {
+  return request({
+    url: 'file/upload',
+    method: 'post',
+    data,
+  })
+}
+// 人员列表
+export function getPersonListPage(params: object) {
+  return request({
+    url: `${prefix}/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 更新人员
+export function updatePerson(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function addPerson(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function delPerson(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/person.ts b/src/router/modules/person.ts
index 5366ecc..4a28d39 100644
--- a/src/router/modules/person.ts
+++ b/src/router/modules/person.ts
@@ -31,7 +31,7 @@
         name: 'personedit',
         component: () => import('@/views/person/personEdit.vue'),
         meta: {
-          title: '人员编辑/:id?',
+          title: '人员编辑/:type?',
           auth: '/person',
           sidebar: false,
           breadcrumb: true,
diff --git a/src/views/device/device-interface.ts b/src/views/device/device-interface.ts
index 8e3d5f9..9205bc0 100644
--- a/src/views/device/device-interface.ts
+++ b/src/views/device/device-interface.ts
@@ -6,4 +6,10 @@
   id?: string
   isPowerSupply: string
   manufacturer: string
+  cameraIp?: string // 摄像头ip
+  cameraPort?: string // 摄像头端口
+  cameraCode?: string // 摄像头编号
+  gasCode?: string // 激甲编号
+  gasIp?: string // 激甲ip
+  gasPort?: string // 激甲端口
 }
diff --git a/src/views/device/deviceEdit.vue b/src/views/device/deviceEdit.vue
index e3f70cb..63d1474 100644
--- a/src/views/device/deviceEdit.vue
+++ b/src/views/device/deviceEdit.vue
@@ -23,6 +23,13 @@
   manufacturer: '', // 厂家
   id: '',
   createTime: '',
+  cameraIp: '', // 摄像头ip
+  cameraPort: '', // 摄像头端口
+  cameraCode: '', // 摄像头编号
+  gasCode: '', // 激甲编号
+  gasIp: '', // 激甲ip
+  gasPort: '', // 激甲端口
+
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -35,6 +42,10 @@
   deviceBatch: [{ required: true, message: '请输入设备批次', trigger: ['blur', 'change'] }],
   isPowerSupply: [{ required: true, message: '请输入设备是否供电', trigger: ['blur', 'change'] }],
   manufacturer: [{ required: true, message: '请输入设备厂家', trigger: ['blur', 'change'] }],
+  cameraPort: [{ required: true, message: '请输入摄像头端口号', trigger: ['blur', 'change'] }],
+  cameraIp: [{ required: true, message: '请输入摄像头ip', trigger: ['blur', 'change'] }],
+  gasIp: [{ required: true, message: '请输入激甲ip', trigger: ['blur', 'change'] }],
+  gasPort: [{ required: true, message: '请输入激甲端口号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -47,8 +58,14 @@
     manufacturer: '', // 厂家
     id: '',
     createTime: '',
+    cameraIp: '', // 摄像头ip
+    cameraPort: '', // 摄像头端口
+    cameraCode: '', // 摄像头编号
+    gasCode: '', // 激甲编号
+    gasIp: '', // 激甲ip
+    gasPort: '', // 激甲端口
   }
-  dataFormRef.value.clearValidate()
+  // dataFormRef.value.clearValidate()
 }
 // 获取设备类型
 const deviceTypeList = ref()
@@ -73,7 +90,6 @@
   dialogFormVisible.value = true
   btnLoading.value = false
   if (dialogStatus.value === 'create') { // 如果是新增，清除验证
-    console.log('新增')
     resetForm()
     isEditMode.value = false
     nextTick(() => {
@@ -81,7 +97,6 @@
     })
   }
   else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
-    console.log('编辑')
     deviceForm.value = {
       deviceType: row.deviceType, // 设备类型
       deviceCode: row.deviceCode, // 设备编号
@@ -90,6 +105,12 @@
       manufacturer: row.manufacturer, // 厂家
       id: row.id,
       createTime: row.createTime,
+      cameraIp: row.cameraIp, // 摄像头ip
+      cameraPort: row.cameraPort, // 摄像头端口
+      cameraCode: row.cameraCode, // 摄像头编号
+      gasCode: row.gasCode, // 激甲编号
+      gasIp: row.gasIp, // 激甲ip
+      gasPort: row.gasPort, // 激甲端口
     }
     isEditMode.value = true
   }
@@ -162,11 +183,20 @@
   dialogFormVisible.value = false
   resetForm()
 }
+// 是否安全帽
+const isANQUANMAO = computed(() => {
+  if (deviceTypeList.value.length) {
+    return deviceTypeList.value.filter((item: any) => item.value === deviceForm.value.deviceType)[0]?.name === '安全树'
+  }
+  else {
+    return false
+  }
+})
 </script>
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
-    <el-form ref="dataFormRef" :rules="rules" :model="deviceForm" label-position="right" label-width="80px">
+    <el-form ref="dataFormRef" :rules="rules" :model="deviceForm" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
@@ -203,6 +233,30 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row v-if="isANQUANMAO" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="激光甲烷IP" prop="gasIp">
+            <el-input v-model.trim="deviceForm.gasIp" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="激光甲烷端口" prop="gasPort">
+            <el-input v-model.trim="deviceForm.gasPort" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isANQUANMAO" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="摄像头IP" prop="cameraIp">
+            <el-input v-model.trim="deviceForm.cameraIp" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="摄像头端口" prop="cameraPort">
+            <el-input v-model.trim="deviceForm.cameraPort" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index fc0240c..0fcc508 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -17,12 +17,12 @@
   deviceCode: '',
   deviceType: '',
   offset: 1,
-  limit: 20,
+  limit: 5,
 })
 const columns = ref<TableColumn[]>([
   {
     text: '设备类型',
-    value: 'deviceType',
+    value: 'deviceTypeName',
     align: 'center',
     // width: 170,
   },
@@ -39,7 +39,7 @@
   },
   {
     text: '是否供电',
-    value: 'isPowerSupply',
+    value: 'isPowerSupplyName',
     align: 'center',
   },
   {
@@ -54,7 +54,7 @@
   },
   {
     text: '当前状态',
-    value: '7',
+    value: 'statusName',
     align: 'center',
   },
 ])
@@ -142,6 +142,7 @@
   <div class="list-log">
     <!-- 布局 -->
     <app-container>
+      <!-- 人员编辑 -->
       <edit-list ref="editRef" @watch-child="search" />
       <!-- 筛选条件 -->
       <search-area @search="search">
diff --git a/src/views/person/index.vue b/src/views/person/index.vue
index 75f6b22..f36b253 100644
--- a/src/views/person/index.vue
+++ b/src/views/person/index.vue
@@ -6,11 +6,19 @@
 <script lang="ts" setup name="person">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import type { dict } from './person-interface'
+import { delPerson, getPersonListPage } from '@/api/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getDictByCode } from '@/api/system/dict'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  beginTime: '',
-  endTime: '',
+  name: '',
+  startDate: '',
+  status: '',
+  deptId: '',
+  endDate: '',
   // logType: '业务日志',
   offset: 1,
   limit: 20,
@@ -18,115 +26,58 @@
 const columns = ref([
   {
     text: '姓名',
-    value: '1',
+    value: 'workerName',
     align: 'center',
     // width: 170,
   },
   {
     text: '性别',
-    value: '2',
+    value: 'genderName',
     align: 'center',
     // width: 100,
   },
   {
     text: '联系方式',
-    value: '3',
+    value: 'phoneNumber',
     align: 'center',
   },
   {
     text: '所属部门',
-    value: '4',
+    value: 'deptName',
     align: 'center',
   },
   {
     text: '注册时间',
-    value: '5',
+    value: 'createTime',
     align: 'center',
   },
   {
     text: '当前状态',
-    value: '6',
+    value: 'statusName',
     align: 'center',
   },
 ])
 const list = ref([])
 const total = ref(20)
-const logTypeList = ref(null)
 const listLoading = ref(true)
-const dialogFormVisible = ref(false)
-const dialogStatus = ref('')
-// 获取日志数据
+// 获取列表
 const fetchData = () => {
   listLoading.value = true
-  // getBizLogList(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [
-    {
-      1: '张三',
-      2: '男',
-      3: '1370000000',
-      4: '生产部',
-      5: '2020-02-02',
-      6: '作业中',
-    },
-    {
-      1: '李四',
-      2: '女',
-      3: '1572000000',
-      4: '运维部',
-      5: '2021-01-01',
-      6: '正常',
-    },
-  ]
-  total.value = list.value.length
-  listLoading.value = false
-}
-
-fetchData()
-
-// 打开详情对话框
-// const detail = (row: any) => {
-//   getBizLogDetail(row.id).then((res) => {
-//     if (res.code === 200) {
-//       ElMessageBox.alert(res.data, '详情', {
-//         confirmButtonText: '确定',
-//       })
-//     }
-//   })
-// }
-
-// 清空日志
-const cleanAll = () => {
-  ElMessageBox.confirm('确定要清空全部日志吗？', '确认操作', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    // delLog().then((response) => {
-    //   if (response.code === 200) {
-    //     ElMessage({
-    //       message: '删除成功',
-    //       type: 'success',
-    //     })
-    //     list.value = []
-    //     total.value = 0
-    //     // this.fetchData()
-    //   }
-    // })
+  getPersonListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
   })
 }
 
+fetchData()
 // 查询数据
 const search = () => {
   fetchData()
 }
 // 新增人员
 const add = (row: any) => {
-  // personRef.value.initDialog('create')
-  $router.push({ path: '/person/personedit' })
+  $router.push({ path: '/person/personedit', query: { type: 'add' } })
 }
 // 人脸注册
 const register = (row: any) => {
@@ -134,14 +85,8 @@
 }
 // 编辑人员
 const edit = (row: any) => {
-  // personRef.value.initDialog('update', {})
+  $router.push({ path: '/person/personedit', query: { type: 'update', row: JSON.stringify(row) } })
 }
-// 获取日志类型
-// const fetchLogType = () => {
-//   getLogType().then((response) => {
-//     logTypeList.value = response.data
-//   })
-// }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
@@ -159,6 +104,50 @@
 const multiSelect = (row: any[]) => {
   selectList.value = row
 }
+// 删除
+const del = () => {
+  if (selectList.value.length) {
+    ElMessageBox.confirm('是否删除所选的数据?', '提示', {
+      confirmButtonText: '是',
+      cancelButtonText: '否',
+      type: 'info',
+    }).then((res) => {
+      // 点击确认
+      const ids = selectList.value.map(item => item.id)
+      delPerson(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
+    }).catch(() => {
+      // 点击取消
+      selectList.value = []
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+const deptTreeList = ref([])
+// 加载组织机构树形下拉
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+// 人员状态列表
+const workerStatusList = ref<dict[]>([])
+const fetchStatusList = () => {
+  getDictByCode('workerStatus').then((response) => {
+    workerStatusList.value = response.data
+  })
+}
+fetchStatusList()
+fetchDeptTree()
 </script>
 
 <template>
@@ -169,31 +158,29 @@
       <!-- 筛选条件 -->
       <search-area @search="search">
         <search-item>
-          <el-input v-model.trim="listQuery.beginTime" placeholder="姓名" clearable />
+          <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.beginTime" clearable placeholder="所属部门">
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value"></el-option>
+          <dept-select v-model="listQuery.deptId" :data="deptTreeList" placeholder="所属部门" style="width: 100%;" />
+        </search-item>
+        <search-item>
+          <el-select v-model="listQuery.status" clearable placeholder="当前状态">
+            <el-option v-for="item in workerStatusList" :key="item.id" :label="item.name" :value="item.value"></el-option>
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.beginTime" clearable placeholder="当前状态">
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value"></el-option>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-date-picker v-model="listQuery.beginTime" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
+          <el-date-picker v-model="listQuery.startDate" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="注册开始时间" />
         </search-item>
         <search-item>
-          <el-date-picker v-model="listQuery.endTime" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
+          <el-date-picker v-model="listQuery.endDate" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="注册结束时间" />
         </search-item>
         <template #btns>
           <el-button class="search-btn" type="primary" @click="add">
             新增
           </el-button>
-          <el-button class="search-btn" type="info" >
+          <el-button class="search-btn" type="info" @click="del">
             删除
           </el-button>
         </template>
@@ -205,7 +192,7 @@
           <template #columns>
             <el-table-column label="人脸注册" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="register(scope.row)">
+                <el-button link type="primary" :disabled="scope.row.workerAvatar" size="small" @click="register(scope.row)">
                   注册
                 </el-button>
               </template>
diff --git a/src/views/person/person-interface.ts b/src/views/person/person-interface.ts
new file mode 100644
index 0000000..b7c9cf7
--- /dev/null
+++ b/src/views/person/person-interface.ts
@@ -0,0 +1,6 @@
+// 字典值类型
+export interface dict {
+  id: string
+  name: string
+  value: string
+}

diff --git a/src/api/person.ts b/src/api/person.ts
new file mode 100644
index 0000000..6593ccf
--- /dev/null
+++ b/src/api/person.ts
@@ -0,0 +1,45 @@
+/**
+ * 人员管理接口
+ */
+import request from './index'
+const prefix = 'worker'
+// 图片上传接口
+export function uploadApi(data: FormData) {
+  return request({
+    url: 'file/upload',
+    method: 'post',
+    data,
+  })
+}
+// 人员列表
+export function getPersonListPage(params: object) {
+  return request({
+    url: `${prefix}/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 更新人员
+export function updatePerson(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function addPerson(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function delPerson(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/person.ts b/src/router/modules/person.ts
index 5366ecc..4a28d39 100644
--- a/src/router/modules/person.ts
+++ b/src/router/modules/person.ts
@@ -31,7 +31,7 @@
         name: 'personedit',
         component: () => import('@/views/person/personEdit.vue'),
         meta: {
-          title: '人员编辑/:id?',
+          title: '人员编辑/:type?',
           auth: '/person',
           sidebar: false,
           breadcrumb: true,
diff --git a/src/views/device/device-interface.ts b/src/views/device/device-interface.ts
index 8e3d5f9..9205bc0 100644
--- a/src/views/device/device-interface.ts
+++ b/src/views/device/device-interface.ts
@@ -6,4 +6,10 @@
   id?: string
   isPowerSupply: string
   manufacturer: string
+  cameraIp?: string // 摄像头ip
+  cameraPort?: string // 摄像头端口
+  cameraCode?: string // 摄像头编号
+  gasCode?: string // 激甲编号
+  gasIp?: string // 激甲ip
+  gasPort?: string // 激甲端口
 }
diff --git a/src/views/device/deviceEdit.vue b/src/views/device/deviceEdit.vue
index e3f70cb..63d1474 100644
--- a/src/views/device/deviceEdit.vue
+++ b/src/views/device/deviceEdit.vue
@@ -23,6 +23,13 @@
   manufacturer: '', // 厂家
   id: '',
   createTime: '',
+  cameraIp: '', // 摄像头ip
+  cameraPort: '', // 摄像头端口
+  cameraCode: '', // 摄像头编号
+  gasCode: '', // 激甲编号
+  gasIp: '', // 激甲ip
+  gasPort: '', // 激甲端口
+
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -35,6 +42,10 @@
   deviceBatch: [{ required: true, message: '请输入设备批次', trigger: ['blur', 'change'] }],
   isPowerSupply: [{ required: true, message: '请输入设备是否供电', trigger: ['blur', 'change'] }],
   manufacturer: [{ required: true, message: '请输入设备厂家', trigger: ['blur', 'change'] }],
+  cameraPort: [{ required: true, message: '请输入摄像头端口号', trigger: ['blur', 'change'] }],
+  cameraIp: [{ required: true, message: '请输入摄像头ip', trigger: ['blur', 'change'] }],
+  gasIp: [{ required: true, message: '请输入激甲ip', trigger: ['blur', 'change'] }],
+  gasPort: [{ required: true, message: '请输入激甲端口号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -47,8 +58,14 @@
     manufacturer: '', // 厂家
     id: '',
     createTime: '',
+    cameraIp: '', // 摄像头ip
+    cameraPort: '', // 摄像头端口
+    cameraCode: '', // 摄像头编号
+    gasCode: '', // 激甲编号
+    gasIp: '', // 激甲ip
+    gasPort: '', // 激甲端口
   }
-  dataFormRef.value.clearValidate()
+  // dataFormRef.value.clearValidate()
 }
 // 获取设备类型
 const deviceTypeList = ref()
@@ -73,7 +90,6 @@
   dialogFormVisible.value = true
   btnLoading.value = false
   if (dialogStatus.value === 'create') { // 如果是新增，清除验证
-    console.log('新增')
     resetForm()
     isEditMode.value = false
     nextTick(() => {
@@ -81,7 +97,6 @@
     })
   }
   else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
-    console.log('编辑')
     deviceForm.value = {
       deviceType: row.deviceType, // 设备类型
       deviceCode: row.deviceCode, // 设备编号
@@ -90,6 +105,12 @@
       manufacturer: row.manufacturer, // 厂家
       id: row.id,
       createTime: row.createTime,
+      cameraIp: row.cameraIp, // 摄像头ip
+      cameraPort: row.cameraPort, // 摄像头端口
+      cameraCode: row.cameraCode, // 摄像头编号
+      gasCode: row.gasCode, // 激甲编号
+      gasIp: row.gasIp, // 激甲ip
+      gasPort: row.gasPort, // 激甲端口
     }
     isEditMode.value = true
   }
@@ -162,11 +183,20 @@
   dialogFormVisible.value = false
   resetForm()
 }
+// 是否安全帽
+const isANQUANMAO = computed(() => {
+  if (deviceTypeList.value.length) {
+    return deviceTypeList.value.filter((item: any) => item.value === deviceForm.value.deviceType)[0]?.name === '安全树'
+  }
+  else {
+    return false
+  }
+})
 </script>
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
-    <el-form ref="dataFormRef" :rules="rules" :model="deviceForm" label-position="right" label-width="80px">
+    <el-form ref="dataFormRef" :rules="rules" :model="deviceForm" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
@@ -203,6 +233,30 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row v-if="isANQUANMAO" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="激光甲烷IP" prop="gasIp">
+            <el-input v-model.trim="deviceForm.gasIp" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="激光甲烷端口" prop="gasPort">
+            <el-input v-model.trim="deviceForm.gasPort" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isANQUANMAO" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="摄像头IP" prop="cameraIp">
+            <el-input v-model.trim="deviceForm.cameraIp" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="摄像头端口" prop="cameraPort">
+            <el-input v-model.trim="deviceForm.cameraPort" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index fc0240c..0fcc508 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -17,12 +17,12 @@
   deviceCode: '',
   deviceType: '',
   offset: 1,
-  limit: 20,
+  limit: 5,
 })
 const columns = ref<TableColumn[]>([
   {
     text: '设备类型',
-    value: 'deviceType',
+    value: 'deviceTypeName',
     align: 'center',
     // width: 170,
   },
@@ -39,7 +39,7 @@
   },
   {
     text: '是否供电',
-    value: 'isPowerSupply',
+    value: 'isPowerSupplyName',
     align: 'center',
   },
   {
@@ -54,7 +54,7 @@
   },
   {
     text: '当前状态',
-    value: '7',
+    value: 'statusName',
     align: 'center',
   },
 ])
@@ -142,6 +142,7 @@
   <div class="list-log">
     <!-- 布局 -->
     <app-container>
+      <!-- 人员编辑 -->
       <edit-list ref="editRef" @watch-child="search" />
       <!-- 筛选条件 -->
       <search-area @search="search">
diff --git a/src/views/person/index.vue b/src/views/person/index.vue
index 75f6b22..f36b253 100644
--- a/src/views/person/index.vue
+++ b/src/views/person/index.vue
@@ -6,11 +6,19 @@
 <script lang="ts" setup name="person">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import type { dict } from './person-interface'
+import { delPerson, getPersonListPage } from '@/api/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getDictByCode } from '@/api/system/dict'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  beginTime: '',
-  endTime: '',
+  name: '',
+  startDate: '',
+  status: '',
+  deptId: '',
+  endDate: '',
   // logType: '业务日志',
   offset: 1,
   limit: 20,
@@ -18,115 +26,58 @@
 const columns = ref([
   {
     text: '姓名',
-    value: '1',
+    value: 'workerName',
     align: 'center',
     // width: 170,
   },
   {
     text: '性别',
-    value: '2',
+    value: 'genderName',
     align: 'center',
     // width: 100,
   },
   {
     text: '联系方式',
-    value: '3',
+    value: 'phoneNumber',
     align: 'center',
   },
   {
     text: '所属部门',
-    value: '4',
+    value: 'deptName',
     align: 'center',
   },
   {
     text: '注册时间',
-    value: '5',
+    value: 'createTime',
     align: 'center',
   },
   {
     text: '当前状态',
-    value: '6',
+    value: 'statusName',
     align: 'center',
   },
 ])
 const list = ref([])
 const total = ref(20)
-const logTypeList = ref(null)
 const listLoading = ref(true)
-const dialogFormVisible = ref(false)
-const dialogStatus = ref('')
-// 获取日志数据
+// 获取列表
 const fetchData = () => {
   listLoading.value = true
-  // getBizLogList(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [
-    {
-      1: '张三',
-      2: '男',
-      3: '1370000000',
-      4: '生产部',
-      5: '2020-02-02',
-      6: '作业中',
-    },
-    {
-      1: '李四',
-      2: '女',
-      3: '1572000000',
-      4: '运维部',
-      5: '2021-01-01',
-      6: '正常',
-    },
-  ]
-  total.value = list.value.length
-  listLoading.value = false
-}
-
-fetchData()
-
-// 打开详情对话框
-// const detail = (row: any) => {
-//   getBizLogDetail(row.id).then((res) => {
-//     if (res.code === 200) {
-//       ElMessageBox.alert(res.data, '详情', {
-//         confirmButtonText: '确定',
-//       })
-//     }
-//   })
-// }
-
-// 清空日志
-const cleanAll = () => {
-  ElMessageBox.confirm('确定要清空全部日志吗？', '确认操作', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    // delLog().then((response) => {
-    //   if (response.code === 200) {
-    //     ElMessage({
-    //       message: '删除成功',
-    //       type: 'success',
-    //     })
-    //     list.value = []
-    //     total.value = 0
-    //     // this.fetchData()
-    //   }
-    // })
+  getPersonListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
   })
 }
 
+fetchData()
 // 查询数据
 const search = () => {
   fetchData()
 }
 // 新增人员
 const add = (row: any) => {
-  // personRef.value.initDialog('create')
-  $router.push({ path: '/person/personedit' })
+  $router.push({ path: '/person/personedit', query: { type: 'add' } })
 }
 // 人脸注册
 const register = (row: any) => {
@@ -134,14 +85,8 @@
 }
 // 编辑人员
 const edit = (row: any) => {
-  // personRef.value.initDialog('update', {})
+  $router.push({ path: '/person/personedit', query: { type: 'update', row: JSON.stringify(row) } })
 }
-// 获取日志类型
-// const fetchLogType = () => {
-//   getLogType().then((response) => {
-//     logTypeList.value = response.data
-//   })
-// }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
@@ -159,6 +104,50 @@
 const multiSelect = (row: any[]) => {
   selectList.value = row
 }
+// 删除
+const del = () => {
+  if (selectList.value.length) {
+    ElMessageBox.confirm('是否删除所选的数据?', '提示', {
+      confirmButtonText: '是',
+      cancelButtonText: '否',
+      type: 'info',
+    }).then((res) => {
+      // 点击确认
+      const ids = selectList.value.map(item => item.id)
+      delPerson(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
+    }).catch(() => {
+      // 点击取消
+      selectList.value = []
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+const deptTreeList = ref([])
+// 加载组织机构树形下拉
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+// 人员状态列表
+const workerStatusList = ref<dict[]>([])
+const fetchStatusList = () => {
+  getDictByCode('workerStatus').then((response) => {
+    workerStatusList.value = response.data
+  })
+}
+fetchStatusList()
+fetchDeptTree()
 </script>
 
 <template>
@@ -169,31 +158,29 @@
       <!-- 筛选条件 -->
       <search-area @search="search">
         <search-item>
-          <el-input v-model.trim="listQuery.beginTime" placeholder="姓名" clearable />
+          <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.beginTime" clearable placeholder="所属部门">
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value"></el-option>
+          <dept-select v-model="listQuery.deptId" :data="deptTreeList" placeholder="所属部门" style="width: 100%;" />
+        </search-item>
+        <search-item>
+          <el-select v-model="listQuery.status" clearable placeholder="当前状态">
+            <el-option v-for="item in workerStatusList" :key="item.id" :label="item.name" :value="item.value"></el-option>
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.beginTime" clearable placeholder="当前状态">
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value"></el-option>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-date-picker v-model="listQuery.beginTime" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
+          <el-date-picker v-model="listQuery.startDate" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="注册开始时间" />
         </search-item>
         <search-item>
-          <el-date-picker v-model="listQuery.endTime" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
+          <el-date-picker v-model="listQuery.endDate" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="注册结束时间" />
         </search-item>
         <template #btns>
           <el-button class="search-btn" type="primary" @click="add">
             新增
           </el-button>
-          <el-button class="search-btn" type="info" >
+          <el-button class="search-btn" type="info" @click="del">
             删除
           </el-button>
         </template>
@@ -205,7 +192,7 @@
           <template #columns>
             <el-table-column label="人脸注册" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="register(scope.row)">
+                <el-button link type="primary" :disabled="scope.row.workerAvatar" size="small" @click="register(scope.row)">
                   注册
                 </el-button>
               </template>
diff --git a/src/views/person/person-interface.ts b/src/views/person/person-interface.ts
new file mode 100644
index 0000000..b7c9cf7
--- /dev/null
+++ b/src/views/person/person-interface.ts
@@ -0,0 +1,6 @@
+// 字典值类型
+export interface dict {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/person/personEdit.vue b/src/views/person/personEdit.vue
index dcff2a0..318c9ad 100644
--- a/src/views/person/personEdit.vue
+++ b/src/views/person/personEdit.vue
@@ -6,18 +6,28 @@
 <script lang="ts" setup name="personEdit">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
-import photograph from './photograph.vue'
 import { Plus } from '@element-plus/icons-vue'
+import photograph from './photograph.vue'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getDictByCode } from '@/api/system/dict'
+import { addPerson, updatePerson, uploadApi } from '@/api/person'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm: { [key: string]: string | any } = ref({
-  account: '',
-  name: '', // 姓名
+  workerName: '', // 姓名
+  gender: '',
+  deptId: '', // 所属部门
+  phoneNumber: '', // 联系方式
+  workerAvatar: '', // 照片
+  idCardNumber: '', // 身份证号
+  workerType: '1',
 }) // 表单
-const multipleTableRef = ref<InstanceType<typeof ElTable>>()
-const title = ref('')
-const staffId = ref('')
+// 图片地址
+const photoUrl = computed(() => {
+  return `${import.meta.env.VITE_APP_API_BASEURL}/static/${ruleForm.value.workerAvatar}`
+})
 const photographRef = ref()
 // 身份证号码验证规则
 const validateIDcard = (rule: any, value: any, callback: any) => {
@@ -30,27 +40,37 @@
   }
 }
 const rules = ref({
-  name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+  workerName: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+  gender: [{ required: true, message: '性别不能为空', trigger: 'blur' }],
+  deptId: [{ required: true, message: '所属部门不能为空', trigger: 'blur' }],
+  phoneNumber: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  idCardNumber: [{ required: true, message: '身份证号码不符合规范', trigger: 'blur', validator: validateIDcard }],
 }) // 表单验证规则
-// 根据身份证得到生日
-const getBirthday = () => {
-  ruleFormRef.value?.validateField('idCard').then((res) => {
-    // 获取生日
-    const IdCard = ruleForm.value.idCard
-    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
-    ruleForm.value.birthday = birthday
-    // 获取性别 第17位  奇数为男 偶数为女
-    // ruleForm.value.sex
-    if (Number(IdCard.substring(16, 17)) % 2) {
-      // 男
-      ruleForm.value.sex = '1'
-    }
-    else {
-      //  女
-      ruleForm.value.sex = '2'
+
+// 图片上传请求
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('file', file.file)
+  uploadApi(fd).then((res) => {
+    if (res.code === 200) {
+      console.log(res.data, '123')
+      ElMessage.success('上传成功')
+      ruleForm.value.workerAvatar = res.data
     }
   })
 }
+// 图片上传之前的验证
+const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png' && rawFile.type !== 'image/jpg') {
+    ElMessage.error('只能上传png/jpeg/jpg格式的图片')
+    return false
+  }
+  else if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('图片不能大于2MB')
+    return false
+  }
+  return true
+}
 // 拍照功能
 const tackPhoto = ref(false)
 const register = () => {
@@ -59,31 +79,10 @@
 }
 // 关闭摄像头
 const offPthot = (url: string) => {
-  console.log(url, '图片地址')
-  tackPhoto.value = false
-}
-// const PubList = ref<TreeStructure[]>([])
-// const PubListTree = ref([])
-// 获取组织列表
-// const getPubList = () => {
-//   getDeptTreeList().then((res) => {
-//     // 转成树结构
-//     PubList.value = res.data
-//     PubListTree.value = toTreeList(res.data, '0', true)
-//   })
-// }
-// const sexList = ref<{ id: string; value: string; name: string }[]>()
-// // 获取性别
-// const getSexList = () => {
-//   getDictByCode('sex').then((response) => {
-//     sexList.value = response.data
-//   })
-// }
-// 重置表单内容
-const resetFormData = () => {
-  ruleForm.value = {
-    name: '', // 姓名
+  if (url) {
+    ruleForm.value.workerAvatar = url
   }
+  tackPhoto.value = false
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
@@ -100,50 +99,81 @@
           type: 'warning',
         },
       ).then(() => {
+        // 更新或者新增
+        ($route.query.type === 'add' ? addPerson(ruleForm.value) : updatePerson(ruleForm.value)).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('操作成功')
+            $router.go(-1)
+          }
+        })
       })
     }
   })
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
+const resetForm = () => {
   $router.go(-1)
 }
+const deptTreeList = ref([])
+// 加载组织机构树形下拉
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+fetchDeptTree()
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sysSex').then((response) => {
+    sexList.value = response.data
+  })
+}
+getSexList()
+const title = ref('')
+onMounted(() => {
+  const type = $route.query.type
+  if (type === 'update') {
+    title.value = '人员编辑'
+    const row = JSON.parse($route.query.row as string)
+    ruleForm.value = row
+  }
+  else {
+    title.value = '人员新增'
+  }
+})
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container>
     <!-- 拍照组件 -->
-    <photograph ref="photographRef" :tack-photo="tackPhoto" @off="offPthot"/>
-    <detail-page :title="`人员新增`">
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+    <photograph ref="photographRef" :tack-photo="tackPhoto" @off="offPthot" />
+    <detail-page :title="title">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" border
+        stripe>
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item prop="minioFileName" >
-              <el-upload
-                class="avatar-uploader"
-                :show-file-list="false"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-upload="beforeAvatarUpload"
-                :disabled="title === '详情'"
-                accept="image/png, image/jpeg,image/jpg"
-              >
-                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
+            <el-form-item>
+              <el-upload class="avatar-uploader" :show-file-list="false" :http-request="uploadQuarterlyEvaluateFile"
+                :before-upload="beforeAvatarUpload" accept="image/png, image/jpeg,image/jpg">
+                <img v-if="ruleForm.workerAvatar" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
               </el-upload>
-              <el-button type="primary" style="margin-top: 20px; display: block; width: 190px;" @click="register">人脸注册</el-button>
+              <el-button type="primary" style="margin-top: 20px; display: block; width: 190px;"
+                @click="register">人脸注册</el-button>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="姓名" prop="name" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.name" placeholder="姓名" :disabled="title === '详情'">
+            <el-form-item label="姓名" prop="workerName" style="margin-top: 40px;">
+              <el-input v-model.trim="ruleForm.workerName" placeholder="姓名">
               </el-input>
             </el-form-item>
-            <el-form-item label="所属部门" prop="sex" class="marg-item" style="margin-top: 40px;">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '所属部门'" style="width: 100%;">
-                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
+            <el-form-item label="所属部门" prop="deptId" class="marg-item" style="margin-top: 40px;">
+              <dept-select v-model="ruleForm.deptId" :data="deptTreeList" placeholder="所属部门" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="职务" prop="name" style="margin-top: 40px;">
               <el-input v-model.trim="ruleForm.name" placeholder="职务" :disabled="title === '详情'">
@@ -151,17 +181,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="性别" prop="sex" class="marg-item" style="margin-top: 40px;">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
+            <el-form-item label="性别" prop="gender" class="marg-item" style="margin-top: 40px;">
+              <el-select v-model="ruleForm.gender" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="联系方式" prop="name" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.name" placeholder="联系方式" :disabled="title === '详情'">
+            <el-form-item label="联系方式" prop="phoneNumber" style="margin-top: 40px;">
+              <el-input v-model.trim="ruleForm.phoneNumber" placeholder="联系方式" :disabled="title === '详情'">
               </el-input>
             </el-form-item>
-            <el-form-item label="证件号码" prop="name" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.name" placeholder="证件号码" :disabled="title === '详情'">
+            <el-form-item label="证件号码" prop="idCardNumber" style="margin-top: 40px;">
+              <el-input v-model.trim="ruleForm.idCardNumber" placeholder="证件号码" :disabled="title === '详情'">
               </el-input>
             </el-form-item>
           </el-col>
@@ -169,10 +199,10 @@
         </el-row>
       </el-form>
       <div class="dialog-footer">
-        <el-button @click="resetForm" style="margin-left: 30px;">
+        <el-button style="margin-left: 30px;" @click="resetForm">
           取消
         </el-button>
-        <el-button :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">
           保存
         </el-button>
       </div>
@@ -181,11 +211,12 @@
 </template>
 
 <style lang="scss" scoped>
-.dialog-footer{
+.dialog-footer {
   display: flex;
   justify-items: end;
   flex-direction: row-reverse;
 }
+
 :deep(.el-radio__label) {
   display: none;
 }
@@ -206,8 +237,9 @@
 
 .isDetail {
   ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap>.el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk)>.el-form-item__label::before {
       display: none;
     }
   }

diff --git a/src/api/person.ts b/src/api/person.ts
new file mode 100644
index 0000000..6593ccf
--- /dev/null
+++ b/src/api/person.ts
@@ -0,0 +1,45 @@
+/**
+ * 人员管理接口
+ */
+import request from './index'
+const prefix = 'worker'
+// 图片上传接口
+export function uploadApi(data: FormData) {
+  return request({
+    url: 'file/upload',
+    method: 'post',
+    data,
+  })
+}
+// 人员列表
+export function getPersonListPage(params: object) {
+  return request({
+    url: `${prefix}/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 更新人员
+export function updatePerson(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function addPerson(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function delPerson(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/person.ts b/src/router/modules/person.ts
index 5366ecc..4a28d39 100644
--- a/src/router/modules/person.ts
+++ b/src/router/modules/person.ts
@@ -31,7 +31,7 @@
         name: 'personedit',
         component: () => import('@/views/person/personEdit.vue'),
         meta: {
-          title: '人员编辑/:id?',
+          title: '人员编辑/:type?',
           auth: '/person',
           sidebar: false,
           breadcrumb: true,
diff --git a/src/views/device/device-interface.ts b/src/views/device/device-interface.ts
index 8e3d5f9..9205bc0 100644
--- a/src/views/device/device-interface.ts
+++ b/src/views/device/device-interface.ts
@@ -6,4 +6,10 @@
   id?: string
   isPowerSupply: string
   manufacturer: string
+  cameraIp?: string // 摄像头ip
+  cameraPort?: string // 摄像头端口
+  cameraCode?: string // 摄像头编号
+  gasCode?: string // 激甲编号
+  gasIp?: string // 激甲ip
+  gasPort?: string // 激甲端口
 }
diff --git a/src/views/device/deviceEdit.vue b/src/views/device/deviceEdit.vue
index e3f70cb..63d1474 100644
--- a/src/views/device/deviceEdit.vue
+++ b/src/views/device/deviceEdit.vue
@@ -23,6 +23,13 @@
   manufacturer: '', // 厂家
   id: '',
   createTime: '',
+  cameraIp: '', // 摄像头ip
+  cameraPort: '', // 摄像头端口
+  cameraCode: '', // 摄像头编号
+  gasCode: '', // 激甲编号
+  gasIp: '', // 激甲ip
+  gasPort: '', // 激甲端口
+
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -35,6 +42,10 @@
   deviceBatch: [{ required: true, message: '请输入设备批次', trigger: ['blur', 'change'] }],
   isPowerSupply: [{ required: true, message: '请输入设备是否供电', trigger: ['blur', 'change'] }],
   manufacturer: [{ required: true, message: '请输入设备厂家', trigger: ['blur', 'change'] }],
+  cameraPort: [{ required: true, message: '请输入摄像头端口号', trigger: ['blur', 'change'] }],
+  cameraIp: [{ required: true, message: '请输入摄像头ip', trigger: ['blur', 'change'] }],
+  gasIp: [{ required: true, message: '请输入激甲ip', trigger: ['blur', 'change'] }],
+  gasPort: [{ required: true, message: '请输入激甲端口号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -47,8 +58,14 @@
     manufacturer: '', // 厂家
     id: '',
     createTime: '',
+    cameraIp: '', // 摄像头ip
+    cameraPort: '', // 摄像头端口
+    cameraCode: '', // 摄像头编号
+    gasCode: '', // 激甲编号
+    gasIp: '', // 激甲ip
+    gasPort: '', // 激甲端口
   }
-  dataFormRef.value.clearValidate()
+  // dataFormRef.value.clearValidate()
 }
 // 获取设备类型
 const deviceTypeList = ref()
@@ -73,7 +90,6 @@
   dialogFormVisible.value = true
   btnLoading.value = false
   if (dialogStatus.value === 'create') { // 如果是新增，清除验证
-    console.log('新增')
     resetForm()
     isEditMode.value = false
     nextTick(() => {
@@ -81,7 +97,6 @@
     })
   }
   else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
-    console.log('编辑')
     deviceForm.value = {
       deviceType: row.deviceType, // 设备类型
       deviceCode: row.deviceCode, // 设备编号
@@ -90,6 +105,12 @@
       manufacturer: row.manufacturer, // 厂家
       id: row.id,
       createTime: row.createTime,
+      cameraIp: row.cameraIp, // 摄像头ip
+      cameraPort: row.cameraPort, // 摄像头端口
+      cameraCode: row.cameraCode, // 摄像头编号
+      gasCode: row.gasCode, // 激甲编号
+      gasIp: row.gasIp, // 激甲ip
+      gasPort: row.gasPort, // 激甲端口
     }
     isEditMode.value = true
   }
@@ -162,11 +183,20 @@
   dialogFormVisible.value = false
   resetForm()
 }
+// 是否安全帽
+const isANQUANMAO = computed(() => {
+  if (deviceTypeList.value.length) {
+    return deviceTypeList.value.filter((item: any) => item.value === deviceForm.value.deviceType)[0]?.name === '安全树'
+  }
+  else {
+    return false
+  }
+})
 </script>
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
-    <el-form ref="dataFormRef" :rules="rules" :model="deviceForm" label-position="right" label-width="80px">
+    <el-form ref="dataFormRef" :rules="rules" :model="deviceForm" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
@@ -203,6 +233,30 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row v-if="isANQUANMAO" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="激光甲烷IP" prop="gasIp">
+            <el-input v-model.trim="deviceForm.gasIp" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="激光甲烷端口" prop="gasPort">
+            <el-input v-model.trim="deviceForm.gasPort" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isANQUANMAO" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="摄像头IP" prop="cameraIp">
+            <el-input v-model.trim="deviceForm.cameraIp" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="摄像头端口" prop="cameraPort">
+            <el-input v-model.trim="deviceForm.cameraPort" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index fc0240c..0fcc508 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -17,12 +17,12 @@
   deviceCode: '',
   deviceType: '',
   offset: 1,
-  limit: 20,
+  limit: 5,
 })
 const columns = ref<TableColumn[]>([
   {
     text: '设备类型',
-    value: 'deviceType',
+    value: 'deviceTypeName',
     align: 'center',
     // width: 170,
   },
@@ -39,7 +39,7 @@
   },
   {
     text: '是否供电',
-    value: 'isPowerSupply',
+    value: 'isPowerSupplyName',
     align: 'center',
   },
   {
@@ -54,7 +54,7 @@
   },
   {
     text: '当前状态',
-    value: '7',
+    value: 'statusName',
     align: 'center',
   },
 ])
@@ -142,6 +142,7 @@
   <div class="list-log">
     <!-- 布局 -->
     <app-container>
+      <!-- 人员编辑 -->
       <edit-list ref="editRef" @watch-child="search" />
       <!-- 筛选条件 -->
       <search-area @search="search">
diff --git a/src/views/person/index.vue b/src/views/person/index.vue
index 75f6b22..f36b253 100644
--- a/src/views/person/index.vue
+++ b/src/views/person/index.vue
@@ -6,11 +6,19 @@
 <script lang="ts" setup name="person">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import type { dict } from './person-interface'
+import { delPerson, getPersonListPage } from '@/api/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getDictByCode } from '@/api/system/dict'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  beginTime: '',
-  endTime: '',
+  name: '',
+  startDate: '',
+  status: '',
+  deptId: '',
+  endDate: '',
   // logType: '业务日志',
   offset: 1,
   limit: 20,
@@ -18,115 +26,58 @@
 const columns = ref([
   {
     text: '姓名',
-    value: '1',
+    value: 'workerName',
     align: 'center',
     // width: 170,
   },
   {
     text: '性别',
-    value: '2',
+    value: 'genderName',
     align: 'center',
     // width: 100,
   },
   {
     text: '联系方式',
-    value: '3',
+    value: 'phoneNumber',
     align: 'center',
   },
   {
     text: '所属部门',
-    value: '4',
+    value: 'deptName',
     align: 'center',
   },
   {
     text: '注册时间',
-    value: '5',
+    value: 'createTime',
     align: 'center',
   },
   {
     text: '当前状态',
-    value: '6',
+    value: 'statusName',
     align: 'center',
   },
 ])
 const list = ref([])
 const total = ref(20)
-const logTypeList = ref(null)
 const listLoading = ref(true)
-const dialogFormVisible = ref(false)
-const dialogStatus = ref('')
-// 获取日志数据
+// 获取列表
 const fetchData = () => {
   listLoading.value = true
-  // getBizLogList(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [
-    {
-      1: '张三',
-      2: '男',
-      3: '1370000000',
-      4: '生产部',
-      5: '2020-02-02',
-      6: '作业中',
-    },
-    {
-      1: '李四',
-      2: '女',
-      3: '1572000000',
-      4: '运维部',
-      5: '2021-01-01',
-      6: '正常',
-    },
-  ]
-  total.value = list.value.length
-  listLoading.value = false
-}
-
-fetchData()
-
-// 打开详情对话框
-// const detail = (row: any) => {
-//   getBizLogDetail(row.id).then((res) => {
-//     if (res.code === 200) {
-//       ElMessageBox.alert(res.data, '详情', {
-//         confirmButtonText: '确定',
-//       })
-//     }
-//   })
-// }
-
-// 清空日志
-const cleanAll = () => {
-  ElMessageBox.confirm('确定要清空全部日志吗？', '确认操作', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    // delLog().then((response) => {
-    //   if (response.code === 200) {
-    //     ElMessage({
-    //       message: '删除成功',
-    //       type: 'success',
-    //     })
-    //     list.value = []
-    //     total.value = 0
-    //     // this.fetchData()
-    //   }
-    // })
+  getPersonListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
   })
 }
 
+fetchData()
 // 查询数据
 const search = () => {
   fetchData()
 }
 // 新增人员
 const add = (row: any) => {
-  // personRef.value.initDialog('create')
-  $router.push({ path: '/person/personedit' })
+  $router.push({ path: '/person/personedit', query: { type: 'add' } })
 }
 // 人脸注册
 const register = (row: any) => {
@@ -134,14 +85,8 @@
 }
 // 编辑人员
 const edit = (row: any) => {
-  // personRef.value.initDialog('update', {})
+  $router.push({ path: '/person/personedit', query: { type: 'update', row: JSON.stringify(row) } })
 }
-// 获取日志类型
-// const fetchLogType = () => {
-//   getLogType().then((response) => {
-//     logTypeList.value = response.data
-//   })
-// }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
@@ -159,6 +104,50 @@
 const multiSelect = (row: any[]) => {
   selectList.value = row
 }
+// 删除
+const del = () => {
+  if (selectList.value.length) {
+    ElMessageBox.confirm('是否删除所选的数据?', '提示', {
+      confirmButtonText: '是',
+      cancelButtonText: '否',
+      type: 'info',
+    }).then((res) => {
+      // 点击确认
+      const ids = selectList.value.map(item => item.id)
+      delPerson(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
+    }).catch(() => {
+      // 点击取消
+      selectList.value = []
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+const deptTreeList = ref([])
+// 加载组织机构树形下拉
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+// 人员状态列表
+const workerStatusList = ref<dict[]>([])
+const fetchStatusList = () => {
+  getDictByCode('workerStatus').then((response) => {
+    workerStatusList.value = response.data
+  })
+}
+fetchStatusList()
+fetchDeptTree()
 </script>
 
 <template>
@@ -169,31 +158,29 @@
       <!-- 筛选条件 -->
       <search-area @search="search">
         <search-item>
-          <el-input v-model.trim="listQuery.beginTime" placeholder="姓名" clearable />
+          <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.beginTime" clearable placeholder="所属部门">
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value"></el-option>
+          <dept-select v-model="listQuery.deptId" :data="deptTreeList" placeholder="所属部门" style="width: 100%;" />
+        </search-item>
+        <search-item>
+          <el-select v-model="listQuery.status" clearable placeholder="当前状态">
+            <el-option v-for="item in workerStatusList" :key="item.id" :label="item.name" :value="item.value"></el-option>
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.beginTime" clearable placeholder="当前状态">
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value"></el-option>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-date-picker v-model="listQuery.beginTime" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
+          <el-date-picker v-model="listQuery.startDate" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="注册开始时间" />
         </search-item>
         <search-item>
-          <el-date-picker v-model="listQuery.endTime" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
+          <el-date-picker v-model="listQuery.endDate" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="注册结束时间" />
         </search-item>
         <template #btns>
           <el-button class="search-btn" type="primary" @click="add">
             新增
           </el-button>
-          <el-button class="search-btn" type="info" >
+          <el-button class="search-btn" type="info" @click="del">
             删除
           </el-button>
         </template>
@@ -205,7 +192,7 @@
           <template #columns>
             <el-table-column label="人脸注册" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="register(scope.row)">
+                <el-button link type="primary" :disabled="scope.row.workerAvatar" size="small" @click="register(scope.row)">
                   注册
                 </el-button>
               </template>
diff --git a/src/views/person/person-interface.ts b/src/views/person/person-interface.ts
new file mode 100644
index 0000000..b7c9cf7
--- /dev/null
+++ b/src/views/person/person-interface.ts
@@ -0,0 +1,6 @@
+// 字典值类型
+export interface dict {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/person/personEdit.vue b/src/views/person/personEdit.vue
index dcff2a0..318c9ad 100644
--- a/src/views/person/personEdit.vue
+++ b/src/views/person/personEdit.vue
@@ -6,18 +6,28 @@
 <script lang="ts" setup name="personEdit">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
-import photograph from './photograph.vue'
 import { Plus } from '@element-plus/icons-vue'
+import photograph from './photograph.vue'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getDictByCode } from '@/api/system/dict'
+import { addPerson, updatePerson, uploadApi } from '@/api/person'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm: { [key: string]: string | any } = ref({
-  account: '',
-  name: '', // 姓名
+  workerName: '', // 姓名
+  gender: '',
+  deptId: '', // 所属部门
+  phoneNumber: '', // 联系方式
+  workerAvatar: '', // 照片
+  idCardNumber: '', // 身份证号
+  workerType: '1',
 }) // 表单
-const multipleTableRef = ref<InstanceType<typeof ElTable>>()
-const title = ref('')
-const staffId = ref('')
+// 图片地址
+const photoUrl = computed(() => {
+  return `${import.meta.env.VITE_APP_API_BASEURL}/static/${ruleForm.value.workerAvatar}`
+})
 const photographRef = ref()
 // 身份证号码验证规则
 const validateIDcard = (rule: any, value: any, callback: any) => {
@@ -30,27 +40,37 @@
   }
 }
 const rules = ref({
-  name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+  workerName: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+  gender: [{ required: true, message: '性别不能为空', trigger: 'blur' }],
+  deptId: [{ required: true, message: '所属部门不能为空', trigger: 'blur' }],
+  phoneNumber: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  idCardNumber: [{ required: true, message: '身份证号码不符合规范', trigger: 'blur', validator: validateIDcard }],
 }) // 表单验证规则
-// 根据身份证得到生日
-const getBirthday = () => {
-  ruleFormRef.value?.validateField('idCard').then((res) => {
-    // 获取生日
-    const IdCard = ruleForm.value.idCard
-    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
-    ruleForm.value.birthday = birthday
-    // 获取性别 第17位  奇数为男 偶数为女
-    // ruleForm.value.sex
-    if (Number(IdCard.substring(16, 17)) % 2) {
-      // 男
-      ruleForm.value.sex = '1'
-    }
-    else {
-      //  女
-      ruleForm.value.sex = '2'
+
+// 图片上传请求
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('file', file.file)
+  uploadApi(fd).then((res) => {
+    if (res.code === 200) {
+      console.log(res.data, '123')
+      ElMessage.success('上传成功')
+      ruleForm.value.workerAvatar = res.data
     }
   })
 }
+// 图片上传之前的验证
+const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png' && rawFile.type !== 'image/jpg') {
+    ElMessage.error('只能上传png/jpeg/jpg格式的图片')
+    return false
+  }
+  else if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('图片不能大于2MB')
+    return false
+  }
+  return true
+}
 // 拍照功能
 const tackPhoto = ref(false)
 const register = () => {
@@ -59,31 +79,10 @@
 }
 // 关闭摄像头
 const offPthot = (url: string) => {
-  console.log(url, '图片地址')
-  tackPhoto.value = false
-}
-// const PubList = ref<TreeStructure[]>([])
-// const PubListTree = ref([])
-// 获取组织列表
-// const getPubList = () => {
-//   getDeptTreeList().then((res) => {
-//     // 转成树结构
-//     PubList.value = res.data
-//     PubListTree.value = toTreeList(res.data, '0', true)
-//   })
-// }
-// const sexList = ref<{ id: string; value: string; name: string }[]>()
-// // 获取性别
-// const getSexList = () => {
-//   getDictByCode('sex').then((response) => {
-//     sexList.value = response.data
-//   })
-// }
-// 重置表单内容
-const resetFormData = () => {
-  ruleForm.value = {
-    name: '', // 姓名
+  if (url) {
+    ruleForm.value.workerAvatar = url
   }
+  tackPhoto.value = false
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
@@ -100,50 +99,81 @@
           type: 'warning',
         },
       ).then(() => {
+        // 更新或者新增
+        ($route.query.type === 'add' ? addPerson(ruleForm.value) : updatePerson(ruleForm.value)).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('操作成功')
+            $router.go(-1)
+          }
+        })
       })
     }
   })
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
+const resetForm = () => {
   $router.go(-1)
 }
+const deptTreeList = ref([])
+// 加载组织机构树形下拉
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+fetchDeptTree()
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sysSex').then((response) => {
+    sexList.value = response.data
+  })
+}
+getSexList()
+const title = ref('')
+onMounted(() => {
+  const type = $route.query.type
+  if (type === 'update') {
+    title.value = '人员编辑'
+    const row = JSON.parse($route.query.row as string)
+    ruleForm.value = row
+  }
+  else {
+    title.value = '人员新增'
+  }
+})
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container>
     <!-- 拍照组件 -->
-    <photograph ref="photographRef" :tack-photo="tackPhoto" @off="offPthot"/>
-    <detail-page :title="`人员新增`">
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+    <photograph ref="photographRef" :tack-photo="tackPhoto" @off="offPthot" />
+    <detail-page :title="title">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" border
+        stripe>
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item prop="minioFileName" >
-              <el-upload
-                class="avatar-uploader"
-                :show-file-list="false"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-upload="beforeAvatarUpload"
-                :disabled="title === '详情'"
-                accept="image/png, image/jpeg,image/jpg"
-              >
-                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
+            <el-form-item>
+              <el-upload class="avatar-uploader" :show-file-list="false" :http-request="uploadQuarterlyEvaluateFile"
+                :before-upload="beforeAvatarUpload" accept="image/png, image/jpeg,image/jpg">
+                <img v-if="ruleForm.workerAvatar" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
               </el-upload>
-              <el-button type="primary" style="margin-top: 20px; display: block; width: 190px;" @click="register">人脸注册</el-button>
+              <el-button type="primary" style="margin-top: 20px; display: block; width: 190px;"
+                @click="register">人脸注册</el-button>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="姓名" prop="name" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.name" placeholder="姓名" :disabled="title === '详情'">
+            <el-form-item label="姓名" prop="workerName" style="margin-top: 40px;">
+              <el-input v-model.trim="ruleForm.workerName" placeholder="姓名">
               </el-input>
             </el-form-item>
-            <el-form-item label="所属部门" prop="sex" class="marg-item" style="margin-top: 40px;">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '所属部门'" style="width: 100%;">
-                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
+            <el-form-item label="所属部门" prop="deptId" class="marg-item" style="margin-top: 40px;">
+              <dept-select v-model="ruleForm.deptId" :data="deptTreeList" placeholder="所属部门" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="职务" prop="name" style="margin-top: 40px;">
               <el-input v-model.trim="ruleForm.name" placeholder="职务" :disabled="title === '详情'">
@@ -151,17 +181,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="性别" prop="sex" class="marg-item" style="margin-top: 40px;">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
+            <el-form-item label="性别" prop="gender" class="marg-item" style="margin-top: 40px;">
+              <el-select v-model="ruleForm.gender" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="联系方式" prop="name" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.name" placeholder="联系方式" :disabled="title === '详情'">
+            <el-form-item label="联系方式" prop="phoneNumber" style="margin-top: 40px;">
+              <el-input v-model.trim="ruleForm.phoneNumber" placeholder="联系方式" :disabled="title === '详情'">
               </el-input>
             </el-form-item>
-            <el-form-item label="证件号码" prop="name" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.name" placeholder="证件号码" :disabled="title === '详情'">
+            <el-form-item label="证件号码" prop="idCardNumber" style="margin-top: 40px;">
+              <el-input v-model.trim="ruleForm.idCardNumber" placeholder="证件号码" :disabled="title === '详情'">
               </el-input>
             </el-form-item>
           </el-col>
@@ -169,10 +199,10 @@
         </el-row>
       </el-form>
       <div class="dialog-footer">
-        <el-button @click="resetForm" style="margin-left: 30px;">
+        <el-button style="margin-left: 30px;" @click="resetForm">
           取消
         </el-button>
-        <el-button :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">
           保存
         </el-button>
       </div>
@@ -181,11 +211,12 @@
 </template>
 
 <style lang="scss" scoped>
-.dialog-footer{
+.dialog-footer {
   display: flex;
   justify-items: end;
   flex-direction: row-reverse;
 }
+
 :deep(.el-radio__label) {
   display: none;
 }
@@ -206,8 +237,9 @@
 
 .isDetail {
   ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap>.el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk)>.el-form-item__label::before {
       display: none;
     }
   }
diff --git a/src/views/person/photograph.vue b/src/views/person/photograph.vue
index 488cf4f..02d4551 100644
--- a/src/views/person/photograph.vue
+++ b/src/views/person/photograph.vue
@@ -5,7 +5,7 @@
  -->
 <script lang="ts" setup name="photograph">
 import { ElMessage } from 'element-plus'
-// import { putFileAttach } from "@/api/customer/animalinfo"
+import { uploadApi } from '@/api/person'
 // 父组件传来的拍照状态 true 拍照 false 关闭拍照
 const props = defineProps({
   tackPhoto: {
@@ -23,6 +23,7 @@
 const blobFile = ref<File>()
 const mediaStreamTrack = ref('')
 const canvasRef = ref()
+const dialogFormVisible = ref(false)
 // 监听接收到拍摄状态后，开始调取摄像头权限
 watch(() => props.tackPhoto, (newVal) => {
   if (newVal) {
@@ -92,11 +93,25 @@
   // 转为本地路径
   const dataurl = canvas.toDataURL('image/jpeg')
   // 用时间戳作为文件名
-  const filenname = Date.now().toString()
+  const filenname = `${Date.now().toString()}.png`
   // 将blob文件转为文件对象
   blobFile.value = dataURLtoFile(dataurl, filenname)
   preViewVisible.value = true
 }
+//  关闭弹窗
+const close = () => {
+  const canvas = document.querySelector('#canvas-photo')
+  // 获取图片base64链接
+  // var image = canvas.toDataURL('image/png')
+  canvas.getContext('2d').clearRect(0, 0, 400, 300)// 清除画布
+  // 关闭摄像头
+  mediaStreamTrack.value.getVideoTracks().forEach((track) => {
+    track.stop()
+  })
+  blobFile.value = null
+  // 告诉父组件关闭摄像头
+  emits('off', '')
+}
 // 保存图片
 const takePhoneUpfile = () => {
   console.log(blobFile.value)
@@ -108,43 +123,28 @@
   const formData = new FormData()
   formData.append('file', blobFile.value)// 图片内容
   // 上传图片
-  // putFileAttach(formData).then(res => {// 后台接口
-  //   loadingbut.value = false
-  //   // this.$emit('picture', res.data.data); // 返回给父组件展示
-  //   props.tackPhoto = false
-  //   canvas.value.getContext('2d').clearRect(0, 0, 400, 300)// 清除画布
-  //   // 关闭摄像头
-  //   mediaStreamTrack.value.getVideoTracks().forEach(function (track) {
-  //     track.stop()
-  //   })
-  // 获取图片base64链接
-  // const canvas = document.querySelector('#canvas-photo')
-  // var image = canvas.toDataURL('image/png')
-  // // 告诉父组件关闭摄像头
-  // emits('off',image)
-  // }, (error) => {
-  //   loadingbut.value = false
-  //   window.console.log(error)
-  // })
+  uploadApi(formData).then((res) => { // 后台接口
+    loadingbut.value = false
+    blobFile.value = null
+    const canvas = document.querySelector('#canvas-photo')
+    // 获取图片base64链接
+    canvas.getContext('2d').clearRect(0, 0, 400, 300)// 清除画布
+    // 关闭摄像头
+    mediaStreamTrack.value.getVideoTracks().forEach((track) => {
+      track.stop()
+    })
+    // 告诉父组件关闭摄像头,并且把返回结果传出去
+    emits('off', res.data)
+    dialogFormVisible.value = false
+  }, (error) => {
+    loadingbut.value = false
+    window.console.log(error)
+  })
 }
-const dialogFormVisible = ref(false)
 const initDialog = () => {
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
-//  关闭弹窗
-const close = () => {
-  const canvas = document.querySelector('#canvas-photo')
-   // 获取图片base64链接
-   var image = canvas.toDataURL('image/png')
-  canvas.getContext('2d').clearRect(0, 0, 400, 300)// 清除画布
-  // 关闭摄像头
-  mediaStreamTrack.value.getVideoTracks().forEach((track) => {
-    track.stop()
-  })
-  // 告诉父组件关闭摄像头
-  emits('off', image)
-}
 </script>
 
 <template>
@@ -156,9 +156,7 @@
           <!-- 这里就是摄像头显示的画面 -->
           <video id="video-photo" width="400" height="300"></video>
           <div class="iCenter">
-            <el-button
-              type="primary" style="margin-top: 10px;"
-                       @click="takePhone">拍照</el-button>
+            <el-button type="primary" style="margin-top: 10px;" @click="takePhone">拍照</el-button>
           </div>
         </el-col>
         <el-col :span="12">

diff --git a/src/api/person.ts b/src/api/person.ts
new file mode 100644
index 0000000..6593ccf
--- /dev/null
+++ b/src/api/person.ts
@@ -0,0 +1,45 @@
+/**
+ * 人员管理接口
+ */
+import request from './index'
+const prefix = 'worker'
+// 图片上传接口
+export function uploadApi(data: FormData) {
+  return request({
+    url: 'file/upload',
+    method: 'post',
+    data,
+  })
+}
+// 人员列表
+export function getPersonListPage(params: object) {
+  return request({
+    url: `${prefix}/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 更新人员
+export function updatePerson(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function addPerson(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function delPerson(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/person.ts b/src/router/modules/person.ts
index 5366ecc..4a28d39 100644
--- a/src/router/modules/person.ts
+++ b/src/router/modules/person.ts
@@ -31,7 +31,7 @@
         name: 'personedit',
         component: () => import('@/views/person/personEdit.vue'),
         meta: {
-          title: '人员编辑/:id?',
+          title: '人员编辑/:type?',
           auth: '/person',
           sidebar: false,
           breadcrumb: true,
diff --git a/src/views/device/device-interface.ts b/src/views/device/device-interface.ts
index 8e3d5f9..9205bc0 100644
--- a/src/views/device/device-interface.ts
+++ b/src/views/device/device-interface.ts
@@ -6,4 +6,10 @@
   id?: string
   isPowerSupply: string
   manufacturer: string
+  cameraIp?: string // 摄像头ip
+  cameraPort?: string // 摄像头端口
+  cameraCode?: string // 摄像头编号
+  gasCode?: string // 激甲编号
+  gasIp?: string // 激甲ip
+  gasPort?: string // 激甲端口
 }
diff --git a/src/views/device/deviceEdit.vue b/src/views/device/deviceEdit.vue
index e3f70cb..63d1474 100644
--- a/src/views/device/deviceEdit.vue
+++ b/src/views/device/deviceEdit.vue
@@ -23,6 +23,13 @@
   manufacturer: '', // 厂家
   id: '',
   createTime: '',
+  cameraIp: '', // 摄像头ip
+  cameraPort: '', // 摄像头端口
+  cameraCode: '', // 摄像头编号
+  gasCode: '', // 激甲编号
+  gasIp: '', // 激甲ip
+  gasPort: '', // 激甲端口
+
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -35,6 +42,10 @@
   deviceBatch: [{ required: true, message: '请输入设备批次', trigger: ['blur', 'change'] }],
   isPowerSupply: [{ required: true, message: '请输入设备是否供电', trigger: ['blur', 'change'] }],
   manufacturer: [{ required: true, message: '请输入设备厂家', trigger: ['blur', 'change'] }],
+  cameraPort: [{ required: true, message: '请输入摄像头端口号', trigger: ['blur', 'change'] }],
+  cameraIp: [{ required: true, message: '请输入摄像头ip', trigger: ['blur', 'change'] }],
+  gasIp: [{ required: true, message: '请输入激甲ip', trigger: ['blur', 'change'] }],
+  gasPort: [{ required: true, message: '请输入激甲端口号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -47,8 +58,14 @@
     manufacturer: '', // 厂家
     id: '',
     createTime: '',
+    cameraIp: '', // 摄像头ip
+    cameraPort: '', // 摄像头端口
+    cameraCode: '', // 摄像头编号
+    gasCode: '', // 激甲编号
+    gasIp: '', // 激甲ip
+    gasPort: '', // 激甲端口
   }
-  dataFormRef.value.clearValidate()
+  // dataFormRef.value.clearValidate()
 }
 // 获取设备类型
 const deviceTypeList = ref()
@@ -73,7 +90,6 @@
   dialogFormVisible.value = true
   btnLoading.value = false
   if (dialogStatus.value === 'create') { // 如果是新增，清除验证
-    console.log('新增')
     resetForm()
     isEditMode.value = false
     nextTick(() => {
@@ -81,7 +97,6 @@
     })
   }
   else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
-    console.log('编辑')
     deviceForm.value = {
       deviceType: row.deviceType, // 设备类型
       deviceCode: row.deviceCode, // 设备编号
@@ -90,6 +105,12 @@
       manufacturer: row.manufacturer, // 厂家
       id: row.id,
       createTime: row.createTime,
+      cameraIp: row.cameraIp, // 摄像头ip
+      cameraPort: row.cameraPort, // 摄像头端口
+      cameraCode: row.cameraCode, // 摄像头编号
+      gasCode: row.gasCode, // 激甲编号
+      gasIp: row.gasIp, // 激甲ip
+      gasPort: row.gasPort, // 激甲端口
     }
     isEditMode.value = true
   }
@@ -162,11 +183,20 @@
   dialogFormVisible.value = false
   resetForm()
 }
+// 是否安全帽
+const isANQUANMAO = computed(() => {
+  if (deviceTypeList.value.length) {
+    return deviceTypeList.value.filter((item: any) => item.value === deviceForm.value.deviceType)[0]?.name === '安全树'
+  }
+  else {
+    return false
+  }
+})
 </script>
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
-    <el-form ref="dataFormRef" :rules="rules" :model="deviceForm" label-position="right" label-width="80px">
+    <el-form ref="dataFormRef" :rules="rules" :model="deviceForm" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
@@ -203,6 +233,30 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row v-if="isANQUANMAO" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="激光甲烷IP" prop="gasIp">
+            <el-input v-model.trim="deviceForm.gasIp" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="激光甲烷端口" prop="gasPort">
+            <el-input v-model.trim="deviceForm.gasPort" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isANQUANMAO" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="摄像头IP" prop="cameraIp">
+            <el-input v-model.trim="deviceForm.cameraIp" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="摄像头端口" prop="cameraPort">
+            <el-input v-model.trim="deviceForm.cameraPort" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index fc0240c..0fcc508 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -17,12 +17,12 @@
   deviceCode: '',
   deviceType: '',
   offset: 1,
-  limit: 20,
+  limit: 5,
 })
 const columns = ref<TableColumn[]>([
   {
     text: '设备类型',
-    value: 'deviceType',
+    value: 'deviceTypeName',
     align: 'center',
     // width: 170,
   },
@@ -39,7 +39,7 @@
   },
   {
     text: '是否供电',
-    value: 'isPowerSupply',
+    value: 'isPowerSupplyName',
     align: 'center',
   },
   {
@@ -54,7 +54,7 @@
   },
   {
     text: '当前状态',
-    value: '7',
+    value: 'statusName',
     align: 'center',
   },
 ])
@@ -142,6 +142,7 @@
   <div class="list-log">
     <!-- 布局 -->
     <app-container>
+      <!-- 人员编辑 -->
       <edit-list ref="editRef" @watch-child="search" />
       <!-- 筛选条件 -->
       <search-area @search="search">
diff --git a/src/views/person/index.vue b/src/views/person/index.vue
index 75f6b22..f36b253 100644
--- a/src/views/person/index.vue
+++ b/src/views/person/index.vue
@@ -6,11 +6,19 @@
 <script lang="ts" setup name="person">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import type { dict } from './person-interface'
+import { delPerson, getPersonListPage } from '@/api/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getDictByCode } from '@/api/system/dict'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  beginTime: '',
-  endTime: '',
+  name: '',
+  startDate: '',
+  status: '',
+  deptId: '',
+  endDate: '',
   // logType: '业务日志',
   offset: 1,
   limit: 20,
@@ -18,115 +26,58 @@
 const columns = ref([
   {
     text: '姓名',
-    value: '1',
+    value: 'workerName',
     align: 'center',
     // width: 170,
   },
   {
     text: '性别',
-    value: '2',
+    value: 'genderName',
     align: 'center',
     // width: 100,
   },
   {
     text: '联系方式',
-    value: '3',
+    value: 'phoneNumber',
     align: 'center',
   },
   {
     text: '所属部门',
-    value: '4',
+    value: 'deptName',
     align: 'center',
   },
   {
     text: '注册时间',
-    value: '5',
+    value: 'createTime',
     align: 'center',
   },
   {
     text: '当前状态',
-    value: '6',
+    value: 'statusName',
     align: 'center',
   },
 ])
 const list = ref([])
 const total = ref(20)
-const logTypeList = ref(null)
 const listLoading = ref(true)
-const dialogFormVisible = ref(false)
-const dialogStatus = ref('')
-// 获取日志数据
+// 获取列表
 const fetchData = () => {
   listLoading.value = true
-  // getBizLogList(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [
-    {
-      1: '张三',
-      2: '男',
-      3: '1370000000',
-      4: '生产部',
-      5: '2020-02-02',
-      6: '作业中',
-    },
-    {
-      1: '李四',
-      2: '女',
-      3: '1572000000',
-      4: '运维部',
-      5: '2021-01-01',
-      6: '正常',
-    },
-  ]
-  total.value = list.value.length
-  listLoading.value = false
-}
-
-fetchData()
-
-// 打开详情对话框
-// const detail = (row: any) => {
-//   getBizLogDetail(row.id).then((res) => {
-//     if (res.code === 200) {
-//       ElMessageBox.alert(res.data, '详情', {
-//         confirmButtonText: '确定',
-//       })
-//     }
-//   })
-// }
-
-// 清空日志
-const cleanAll = () => {
-  ElMessageBox.confirm('确定要清空全部日志吗？', '确认操作', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    // delLog().then((response) => {
-    //   if (response.code === 200) {
-    //     ElMessage({
-    //       message: '删除成功',
-    //       type: 'success',
-    //     })
-    //     list.value = []
-    //     total.value = 0
-    //     // this.fetchData()
-    //   }
-    // })
+  getPersonListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
   })
 }
 
+fetchData()
 // 查询数据
 const search = () => {
   fetchData()
 }
 // 新增人员
 const add = (row: any) => {
-  // personRef.value.initDialog('create')
-  $router.push({ path: '/person/personedit' })
+  $router.push({ path: '/person/personedit', query: { type: 'add' } })
 }
 // 人脸注册
 const register = (row: any) => {
@@ -134,14 +85,8 @@
 }
 // 编辑人员
 const edit = (row: any) => {
-  // personRef.value.initDialog('update', {})
+  $router.push({ path: '/person/personedit', query: { type: 'update', row: JSON.stringify(row) } })
 }
-// 获取日志类型
-// const fetchLogType = () => {
-//   getLogType().then((response) => {
-//     logTypeList.value = response.data
-//   })
-// }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
@@ -159,6 +104,50 @@
 const multiSelect = (row: any[]) => {
   selectList.value = row
 }
+// 删除
+const del = () => {
+  if (selectList.value.length) {
+    ElMessageBox.confirm('是否删除所选的数据?', '提示', {
+      confirmButtonText: '是',
+      cancelButtonText: '否',
+      type: 'info',
+    }).then((res) => {
+      // 点击确认
+      const ids = selectList.value.map(item => item.id)
+      delPerson(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
+    }).catch(() => {
+      // 点击取消
+      selectList.value = []
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+const deptTreeList = ref([])
+// 加载组织机构树形下拉
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+// 人员状态列表
+const workerStatusList = ref<dict[]>([])
+const fetchStatusList = () => {
+  getDictByCode('workerStatus').then((response) => {
+    workerStatusList.value = response.data
+  })
+}
+fetchStatusList()
+fetchDeptTree()
 </script>
 
 <template>
@@ -169,31 +158,29 @@
       <!-- 筛选条件 -->
       <search-area @search="search">
         <search-item>
-          <el-input v-model.trim="listQuery.beginTime" placeholder="姓名" clearable />
+          <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.beginTime" clearable placeholder="所属部门">
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value"></el-option>
+          <dept-select v-model="listQuery.deptId" :data="deptTreeList" placeholder="所属部门" style="width: 100%;" />
+        </search-item>
+        <search-item>
+          <el-select v-model="listQuery.status" clearable placeholder="当前状态">
+            <el-option v-for="item in workerStatusList" :key="item.id" :label="item.name" :value="item.value"></el-option>
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.beginTime" clearable placeholder="当前状态">
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value"></el-option>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-date-picker v-model="listQuery.beginTime" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
+          <el-date-picker v-model="listQuery.startDate" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="注册开始时间" />
         </search-item>
         <search-item>
-          <el-date-picker v-model="listQuery.endTime" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
+          <el-date-picker v-model="listQuery.endDate" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="注册结束时间" />
         </search-item>
         <template #btns>
           <el-button class="search-btn" type="primary" @click="add">
             新增
           </el-button>
-          <el-button class="search-btn" type="info" >
+          <el-button class="search-btn" type="info" @click="del">
             删除
           </el-button>
         </template>
@@ -205,7 +192,7 @@
           <template #columns>
             <el-table-column label="人脸注册" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="register(scope.row)">
+                <el-button link type="primary" :disabled="scope.row.workerAvatar" size="small" @click="register(scope.row)">
                   注册
                 </el-button>
               </template>
diff --git a/src/views/person/person-interface.ts b/src/views/person/person-interface.ts
new file mode 100644
index 0000000..b7c9cf7
--- /dev/null
+++ b/src/views/person/person-interface.ts
@@ -0,0 +1,6 @@
+// 字典值类型
+export interface dict {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/person/personEdit.vue b/src/views/person/personEdit.vue
index dcff2a0..318c9ad 100644
--- a/src/views/person/personEdit.vue
+++ b/src/views/person/personEdit.vue
@@ -6,18 +6,28 @@
 <script lang="ts" setup name="personEdit">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
-import photograph from './photograph.vue'
 import { Plus } from '@element-plus/icons-vue'
+import photograph from './photograph.vue'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getDictByCode } from '@/api/system/dict'
+import { addPerson, updatePerson, uploadApi } from '@/api/person'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm: { [key: string]: string | any } = ref({
-  account: '',
-  name: '', // 姓名
+  workerName: '', // 姓名
+  gender: '',
+  deptId: '', // 所属部门
+  phoneNumber: '', // 联系方式
+  workerAvatar: '', // 照片
+  idCardNumber: '', // 身份证号
+  workerType: '1',
 }) // 表单
-const multipleTableRef = ref<InstanceType<typeof ElTable>>()
-const title = ref('')
-const staffId = ref('')
+// 图片地址
+const photoUrl = computed(() => {
+  return `${import.meta.env.VITE_APP_API_BASEURL}/static/${ruleForm.value.workerAvatar}`
+})
 const photographRef = ref()
 // 身份证号码验证规则
 const validateIDcard = (rule: any, value: any, callback: any) => {
@@ -30,27 +40,37 @@
   }
 }
 const rules = ref({
-  name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+  workerName: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+  gender: [{ required: true, message: '性别不能为空', trigger: 'blur' }],
+  deptId: [{ required: true, message: '所属部门不能为空', trigger: 'blur' }],
+  phoneNumber: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  idCardNumber: [{ required: true, message: '身份证号码不符合规范', trigger: 'blur', validator: validateIDcard }],
 }) // 表单验证规则
-// 根据身份证得到生日
-const getBirthday = () => {
-  ruleFormRef.value?.validateField('idCard').then((res) => {
-    // 获取生日
-    const IdCard = ruleForm.value.idCard
-    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
-    ruleForm.value.birthday = birthday
-    // 获取性别 第17位  奇数为男 偶数为女
-    // ruleForm.value.sex
-    if (Number(IdCard.substring(16, 17)) % 2) {
-      // 男
-      ruleForm.value.sex = '1'
-    }
-    else {
-      //  女
-      ruleForm.value.sex = '2'
+
+// 图片上传请求
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('file', file.file)
+  uploadApi(fd).then((res) => {
+    if (res.code === 200) {
+      console.log(res.data, '123')
+      ElMessage.success('上传成功')
+      ruleForm.value.workerAvatar = res.data
     }
   })
 }
+// 图片上传之前的验证
+const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png' && rawFile.type !== 'image/jpg') {
+    ElMessage.error('只能上传png/jpeg/jpg格式的图片')
+    return false
+  }
+  else if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('图片不能大于2MB')
+    return false
+  }
+  return true
+}
 // 拍照功能
 const tackPhoto = ref(false)
 const register = () => {
@@ -59,31 +79,10 @@
 }
 // 关闭摄像头
 const offPthot = (url: string) => {
-  console.log(url, '图片地址')
-  tackPhoto.value = false
-}
-// const PubList = ref<TreeStructure[]>([])
-// const PubListTree = ref([])
-// 获取组织列表
-// const getPubList = () => {
-//   getDeptTreeList().then((res) => {
-//     // 转成树结构
-//     PubList.value = res.data
-//     PubListTree.value = toTreeList(res.data, '0', true)
-//   })
-// }
-// const sexList = ref<{ id: string; value: string; name: string }[]>()
-// // 获取性别
-// const getSexList = () => {
-//   getDictByCode('sex').then((response) => {
-//     sexList.value = response.data
-//   })
-// }
-// 重置表单内容
-const resetFormData = () => {
-  ruleForm.value = {
-    name: '', // 姓名
+  if (url) {
+    ruleForm.value.workerAvatar = url
   }
+  tackPhoto.value = false
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
@@ -100,50 +99,81 @@
           type: 'warning',
         },
       ).then(() => {
+        // 更新或者新增
+        ($route.query.type === 'add' ? addPerson(ruleForm.value) : updatePerson(ruleForm.value)).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('操作成功')
+            $router.go(-1)
+          }
+        })
       })
     }
   })
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
+const resetForm = () => {
   $router.go(-1)
 }
+const deptTreeList = ref([])
+// 加载组织机构树形下拉
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+fetchDeptTree()
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sysSex').then((response) => {
+    sexList.value = response.data
+  })
+}
+getSexList()
+const title = ref('')
+onMounted(() => {
+  const type = $route.query.type
+  if (type === 'update') {
+    title.value = '人员编辑'
+    const row = JSON.parse($route.query.row as string)
+    ruleForm.value = row
+  }
+  else {
+    title.value = '人员新增'
+  }
+})
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container>
     <!-- 拍照组件 -->
-    <photograph ref="photographRef" :tack-photo="tackPhoto" @off="offPthot"/>
-    <detail-page :title="`人员新增`">
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+    <photograph ref="photographRef" :tack-photo="tackPhoto" @off="offPthot" />
+    <detail-page :title="title">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" border
+        stripe>
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item prop="minioFileName" >
-              <el-upload
-                class="avatar-uploader"
-                :show-file-list="false"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-upload="beforeAvatarUpload"
-                :disabled="title === '详情'"
-                accept="image/png, image/jpeg,image/jpg"
-              >
-                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
+            <el-form-item>
+              <el-upload class="avatar-uploader" :show-file-list="false" :http-request="uploadQuarterlyEvaluateFile"
+                :before-upload="beforeAvatarUpload" accept="image/png, image/jpeg,image/jpg">
+                <img v-if="ruleForm.workerAvatar" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
               </el-upload>
-              <el-button type="primary" style="margin-top: 20px; display: block; width: 190px;" @click="register">人脸注册</el-button>
+              <el-button type="primary" style="margin-top: 20px; display: block; width: 190px;"
+                @click="register">人脸注册</el-button>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="姓名" prop="name" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.name" placeholder="姓名" :disabled="title === '详情'">
+            <el-form-item label="姓名" prop="workerName" style="margin-top: 40px;">
+              <el-input v-model.trim="ruleForm.workerName" placeholder="姓名">
               </el-input>
             </el-form-item>
-            <el-form-item label="所属部门" prop="sex" class="marg-item" style="margin-top: 40px;">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '所属部门'" style="width: 100%;">
-                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
+            <el-form-item label="所属部门" prop="deptId" class="marg-item" style="margin-top: 40px;">
+              <dept-select v-model="ruleForm.deptId" :data="deptTreeList" placeholder="所属部门" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="职务" prop="name" style="margin-top: 40px;">
               <el-input v-model.trim="ruleForm.name" placeholder="职务" :disabled="title === '详情'">
@@ -151,17 +181,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="性别" prop="sex" class="marg-item" style="margin-top: 40px;">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
+            <el-form-item label="性别" prop="gender" class="marg-item" style="margin-top: 40px;">
+              <el-select v-model="ruleForm.gender" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="联系方式" prop="name" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.name" placeholder="联系方式" :disabled="title === '详情'">
+            <el-form-item label="联系方式" prop="phoneNumber" style="margin-top: 40px;">
+              <el-input v-model.trim="ruleForm.phoneNumber" placeholder="联系方式" :disabled="title === '详情'">
               </el-input>
             </el-form-item>
-            <el-form-item label="证件号码" prop="name" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.name" placeholder="证件号码" :disabled="title === '详情'">
+            <el-form-item label="证件号码" prop="idCardNumber" style="margin-top: 40px;">
+              <el-input v-model.trim="ruleForm.idCardNumber" placeholder="证件号码" :disabled="title === '详情'">
               </el-input>
             </el-form-item>
           </el-col>
@@ -169,10 +199,10 @@
         </el-row>
       </el-form>
       <div class="dialog-footer">
-        <el-button @click="resetForm" style="margin-left: 30px;">
+        <el-button style="margin-left: 30px;" @click="resetForm">
           取消
         </el-button>
-        <el-button :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">
           保存
         </el-button>
       </div>
@@ -181,11 +211,12 @@
 </template>
 
 <style lang="scss" scoped>
-.dialog-footer{
+.dialog-footer {
   display: flex;
   justify-items: end;
   flex-direction: row-reverse;
 }
+
 :deep(.el-radio__label) {
   display: none;
 }
@@ -206,8 +237,9 @@
 
 .isDetail {
   ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap>.el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk)>.el-form-item__label::before {
       display: none;
     }
   }
diff --git a/src/views/person/photograph.vue b/src/views/person/photograph.vue
index 488cf4f..02d4551 100644
--- a/src/views/person/photograph.vue
+++ b/src/views/person/photograph.vue
@@ -5,7 +5,7 @@
  -->
 <script lang="ts" setup name="photograph">
 import { ElMessage } from 'element-plus'
-// import { putFileAttach } from "@/api/customer/animalinfo"
+import { uploadApi } from '@/api/person'
 // 父组件传来的拍照状态 true 拍照 false 关闭拍照
 const props = defineProps({
   tackPhoto: {
@@ -23,6 +23,7 @@
 const blobFile = ref<File>()
 const mediaStreamTrack = ref('')
 const canvasRef = ref()
+const dialogFormVisible = ref(false)
 // 监听接收到拍摄状态后，开始调取摄像头权限
 watch(() => props.tackPhoto, (newVal) => {
   if (newVal) {
@@ -92,11 +93,25 @@
   // 转为本地路径
   const dataurl = canvas.toDataURL('image/jpeg')
   // 用时间戳作为文件名
-  const filenname = Date.now().toString()
+  const filenname = `${Date.now().toString()}.png`
   // 将blob文件转为文件对象
   blobFile.value = dataURLtoFile(dataurl, filenname)
   preViewVisible.value = true
 }
+//  关闭弹窗
+const close = () => {
+  const canvas = document.querySelector('#canvas-photo')
+  // 获取图片base64链接
+  // var image = canvas.toDataURL('image/png')
+  canvas.getContext('2d').clearRect(0, 0, 400, 300)// 清除画布
+  // 关闭摄像头
+  mediaStreamTrack.value.getVideoTracks().forEach((track) => {
+    track.stop()
+  })
+  blobFile.value = null
+  // 告诉父组件关闭摄像头
+  emits('off', '')
+}
 // 保存图片
 const takePhoneUpfile = () => {
   console.log(blobFile.value)
@@ -108,43 +123,28 @@
   const formData = new FormData()
   formData.append('file', blobFile.value)// 图片内容
   // 上传图片
-  // putFileAttach(formData).then(res => {// 后台接口
-  //   loadingbut.value = false
-  //   // this.$emit('picture', res.data.data); // 返回给父组件展示
-  //   props.tackPhoto = false
-  //   canvas.value.getContext('2d').clearRect(0, 0, 400, 300)// 清除画布
-  //   // 关闭摄像头
-  //   mediaStreamTrack.value.getVideoTracks().forEach(function (track) {
-  //     track.stop()
-  //   })
-  // 获取图片base64链接
-  // const canvas = document.querySelector('#canvas-photo')
-  // var image = canvas.toDataURL('image/png')
-  // // 告诉父组件关闭摄像头
-  // emits('off',image)
-  // }, (error) => {
-  //   loadingbut.value = false
-  //   window.console.log(error)
-  // })
+  uploadApi(formData).then((res) => { // 后台接口
+    loadingbut.value = false
+    blobFile.value = null
+    const canvas = document.querySelector('#canvas-photo')
+    // 获取图片base64链接
+    canvas.getContext('2d').clearRect(0, 0, 400, 300)// 清除画布
+    // 关闭摄像头
+    mediaStreamTrack.value.getVideoTracks().forEach((track) => {
+      track.stop()
+    })
+    // 告诉父组件关闭摄像头,并且把返回结果传出去
+    emits('off', res.data)
+    dialogFormVisible.value = false
+  }, (error) => {
+    loadingbut.value = false
+    window.console.log(error)
+  })
 }
-const dialogFormVisible = ref(false)
 const initDialog = () => {
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
-//  关闭弹窗
-const close = () => {
-  const canvas = document.querySelector('#canvas-photo')
-   // 获取图片base64链接
-   var image = canvas.toDataURL('image/png')
-  canvas.getContext('2d').clearRect(0, 0, 400, 300)// 清除画布
-  // 关闭摄像头
-  mediaStreamTrack.value.getVideoTracks().forEach((track) => {
-    track.stop()
-  })
-  // 告诉父组件关闭摄像头
-  emits('off', image)
-}
 </script>
 
 <template>
@@ -156,9 +156,7 @@
           <!-- 这里就是摄像头显示的画面 -->
           <video id="video-photo" width="400" height="300"></video>
           <div class="iCenter">
-            <el-button
-              type="primary" style="margin-top: 10px;"
-                       @click="takePhone">拍照</el-button>
+            <el-button type="primary" style="margin-top: 10px;" @click="takePhone">拍照</el-button>
           </div>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/scene/components/deviceListDialog.vue b/src/views/scene/components/deviceListDialog.vue
new file mode 100644
index 0000000..2733e3a
--- /dev/null
+++ b/src/views/scene/components/deviceListDialog.vue
@@ -0,0 +1,194 @@
+<!--
+  Description: 选择人员穿戴设备弹窗
+  Author: 李亚光
+  Date: 2023-04-28
+ -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getDeviceListPage } from '@/api/device'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { DictDetail } from '@/views/system/dict/dict-interface'
+const props = defineProps({
+  //  多选
+  multiple: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  deviceCode: '',
+  deviceType: '',
+  deviceStatus: '0',
+  offset: 1,
+  limit: 5,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref(0)
+const select = ref(-1)
+const deviceType = ref('') // 设备类型
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'deviceCode' },
+  {
+    text: '厂家',
+    value: 'manufacturer',
+  },
+  { text: '是否供电', value: 'isPowerSupplyName' },
+  { text: '批次', value: 'deviceBatch' },
+  { text: '注册时间', value: 'createTime' },
+])
+// 获取设备数据列表
+const fetchData = () => {
+  select.value = -1
+  getDeviceListPage(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.rows.length
+    }
+  })
+}
+// 获取设备类型
+const deviceTypeList = ref<DictDetail[]>([])
+const fetchDeviceType = () => {
+  getDictByCode('deviceType').then((response) => {
+    deviceTypeList.value = response.data
+  })
+}
+fetchDeviceType()
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 重置
+const reset = () => {
+  listQuery.value.deviceCode = ''
+  listQuery.value.offset = 1
+  listQuery.value.limit = 5
+  search()
+  selectList.value = []
+  select.value = -1
+}
+
+// 点击保存
+const submitForm = () => {
+  if (props.multiple) {
+    // 多选
+    if (selectList.value.length > 0) {
+      emits('add', selectList.value)
+      dialogFormVisible.value = false
+      reset()
+    }
+    else {
+      ElMessage.warning('请先选择设备')
+    }
+  }
+  else {
+    // 单选
+    if (select.value >= 0) {
+      const person = list.value.filter((item, index) => index == select.value)[0]
+      emits('add', Object.assign(person, { Type: deviceType.value }))
+      dialogFormVisible.value = false
+      reset()
+    }
+    else {
+      ElMessage.warning('请先选择设备')
+    }
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = (type: string) => {
+  deviceType.value = type
+  let typeName = ''
+  dialogFormVisible.value = true
+  if (type === 'hatCode') {
+    typeName = '安全帽'
+    // 安全帽
+  }
+  else if (type === 'vastCode') {
+    // 安全背心
+    typeName = '背心'
+  }
+  else if (type === 'braceletCode') {
+    // 安全手环
+    typeName = '手环'
+  }
+  else if (type === 'SafetyTree') {
+    // 安全手环
+    typeName = '安全树'
+  }
+  const devicetype = deviceTypeList.value.filter(item => item.name === typeName)[0].value
+  listQuery.value.deviceType = devicetype
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.deviceCode" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+        :list-loading="loadingTable" @change="changePage" :is-showmulti-select="props.multiple" :is-multi="props.multiple"
+        @multi-select="multiSelect">
+        <template #preColumns>
+          <el-table-column v-if="!props.multiple" label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>

diff --git a/src/api/person.ts b/src/api/person.ts
new file mode 100644
index 0000000..6593ccf
--- /dev/null
+++ b/src/api/person.ts
@@ -0,0 +1,45 @@
+/**
+ * 人员管理接口
+ */
+import request from './index'
+const prefix = 'worker'
+// 图片上传接口
+export function uploadApi(data: FormData) {
+  return request({
+    url: 'file/upload',
+    method: 'post',
+    data,
+  })
+}
+// 人员列表
+export function getPersonListPage(params: object) {
+  return request({
+    url: `${prefix}/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 更新人员
+export function updatePerson(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function addPerson(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function delPerson(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/person.ts b/src/router/modules/person.ts
index 5366ecc..4a28d39 100644
--- a/src/router/modules/person.ts
+++ b/src/router/modules/person.ts
@@ -31,7 +31,7 @@
         name: 'personedit',
         component: () => import('@/views/person/personEdit.vue'),
         meta: {
-          title: '人员编辑/:id?',
+          title: '人员编辑/:type?',
           auth: '/person',
           sidebar: false,
           breadcrumb: true,
diff --git a/src/views/device/device-interface.ts b/src/views/device/device-interface.ts
index 8e3d5f9..9205bc0 100644
--- a/src/views/device/device-interface.ts
+++ b/src/views/device/device-interface.ts
@@ -6,4 +6,10 @@
   id?: string
   isPowerSupply: string
   manufacturer: string
+  cameraIp?: string // 摄像头ip
+  cameraPort?: string // 摄像头端口
+  cameraCode?: string // 摄像头编号
+  gasCode?: string // 激甲编号
+  gasIp?: string // 激甲ip
+  gasPort?: string // 激甲端口
 }
diff --git a/src/views/device/deviceEdit.vue b/src/views/device/deviceEdit.vue
index e3f70cb..63d1474 100644
--- a/src/views/device/deviceEdit.vue
+++ b/src/views/device/deviceEdit.vue
@@ -23,6 +23,13 @@
   manufacturer: '', // 厂家
   id: '',
   createTime: '',
+  cameraIp: '', // 摄像头ip
+  cameraPort: '', // 摄像头端口
+  cameraCode: '', // 摄像头编号
+  gasCode: '', // 激甲编号
+  gasIp: '', // 激甲ip
+  gasPort: '', // 激甲端口
+
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -35,6 +42,10 @@
   deviceBatch: [{ required: true, message: '请输入设备批次', trigger: ['blur', 'change'] }],
   isPowerSupply: [{ required: true, message: '请输入设备是否供电', trigger: ['blur', 'change'] }],
   manufacturer: [{ required: true, message: '请输入设备厂家', trigger: ['blur', 'change'] }],
+  cameraPort: [{ required: true, message: '请输入摄像头端口号', trigger: ['blur', 'change'] }],
+  cameraIp: [{ required: true, message: '请输入摄像头ip', trigger: ['blur', 'change'] }],
+  gasIp: [{ required: true, message: '请输入激甲ip', trigger: ['blur', 'change'] }],
+  gasPort: [{ required: true, message: '请输入激甲端口号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -47,8 +58,14 @@
     manufacturer: '', // 厂家
     id: '',
     createTime: '',
+    cameraIp: '', // 摄像头ip
+    cameraPort: '', // 摄像头端口
+    cameraCode: '', // 摄像头编号
+    gasCode: '', // 激甲编号
+    gasIp: '', // 激甲ip
+    gasPort: '', // 激甲端口
   }
-  dataFormRef.value.clearValidate()
+  // dataFormRef.value.clearValidate()
 }
 // 获取设备类型
 const deviceTypeList = ref()
@@ -73,7 +90,6 @@
   dialogFormVisible.value = true
   btnLoading.value = false
   if (dialogStatus.value === 'create') { // 如果是新增，清除验证
-    console.log('新增')
     resetForm()
     isEditMode.value = false
     nextTick(() => {
@@ -81,7 +97,6 @@
     })
   }
   else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
-    console.log('编辑')
     deviceForm.value = {
       deviceType: row.deviceType, // 设备类型
       deviceCode: row.deviceCode, // 设备编号
@@ -90,6 +105,12 @@
       manufacturer: row.manufacturer, // 厂家
       id: row.id,
       createTime: row.createTime,
+      cameraIp: row.cameraIp, // 摄像头ip
+      cameraPort: row.cameraPort, // 摄像头端口
+      cameraCode: row.cameraCode, // 摄像头编号
+      gasCode: row.gasCode, // 激甲编号
+      gasIp: row.gasIp, // 激甲ip
+      gasPort: row.gasPort, // 激甲端口
     }
     isEditMode.value = true
   }
@@ -162,11 +183,20 @@
   dialogFormVisible.value = false
   resetForm()
 }
+// 是否安全帽
+const isANQUANMAO = computed(() => {
+  if (deviceTypeList.value.length) {
+    return deviceTypeList.value.filter((item: any) => item.value === deviceForm.value.deviceType)[0]?.name === '安全树'
+  }
+  else {
+    return false
+  }
+})
 </script>
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
-    <el-form ref="dataFormRef" :rules="rules" :model="deviceForm" label-position="right" label-width="80px">
+    <el-form ref="dataFormRef" :rules="rules" :model="deviceForm" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
@@ -203,6 +233,30 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row v-if="isANQUANMAO" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="激光甲烷IP" prop="gasIp">
+            <el-input v-model.trim="deviceForm.gasIp" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="激光甲烷端口" prop="gasPort">
+            <el-input v-model.trim="deviceForm.gasPort" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isANQUANMAO" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="摄像头IP" prop="cameraIp">
+            <el-input v-model.trim="deviceForm.cameraIp" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="摄像头端口" prop="cameraPort">
+            <el-input v-model.trim="deviceForm.cameraPort" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index fc0240c..0fcc508 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -17,12 +17,12 @@
   deviceCode: '',
   deviceType: '',
   offset: 1,
-  limit: 20,
+  limit: 5,
 })
 const columns = ref<TableColumn[]>([
   {
     text: '设备类型',
-    value: 'deviceType',
+    value: 'deviceTypeName',
     align: 'center',
     // width: 170,
   },
@@ -39,7 +39,7 @@
   },
   {
     text: '是否供电',
-    value: 'isPowerSupply',
+    value: 'isPowerSupplyName',
     align: 'center',
   },
   {
@@ -54,7 +54,7 @@
   },
   {
     text: '当前状态',
-    value: '7',
+    value: 'statusName',
     align: 'center',
   },
 ])
@@ -142,6 +142,7 @@
   <div class="list-log">
     <!-- 布局 -->
     <app-container>
+      <!-- 人员编辑 -->
       <edit-list ref="editRef" @watch-child="search" />
       <!-- 筛选条件 -->
       <search-area @search="search">
diff --git a/src/views/person/index.vue b/src/views/person/index.vue
index 75f6b22..f36b253 100644
--- a/src/views/person/index.vue
+++ b/src/views/person/index.vue
@@ -6,11 +6,19 @@
 <script lang="ts" setup name="person">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import type { dict } from './person-interface'
+import { delPerson, getPersonListPage } from '@/api/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getDictByCode } from '@/api/system/dict'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  beginTime: '',
-  endTime: '',
+  name: '',
+  startDate: '',
+  status: '',
+  deptId: '',
+  endDate: '',
   // logType: '业务日志',
   offset: 1,
   limit: 20,
@@ -18,115 +26,58 @@
 const columns = ref([
   {
     text: '姓名',
-    value: '1',
+    value: 'workerName',
     align: 'center',
     // width: 170,
   },
   {
     text: '性别',
-    value: '2',
+    value: 'genderName',
     align: 'center',
     // width: 100,
   },
   {
     text: '联系方式',
-    value: '3',
+    value: 'phoneNumber',
     align: 'center',
   },
   {
     text: '所属部门',
-    value: '4',
+    value: 'deptName',
     align: 'center',
   },
   {
     text: '注册时间',
-    value: '5',
+    value: 'createTime',
     align: 'center',
   },
   {
     text: '当前状态',
-    value: '6',
+    value: 'statusName',
     align: 'center',
   },
 ])
 const list = ref([])
 const total = ref(20)
-const logTypeList = ref(null)
 const listLoading = ref(true)
-const dialogFormVisible = ref(false)
-const dialogStatus = ref('')
-// 获取日志数据
+// 获取列表
 const fetchData = () => {
   listLoading.value = true
-  // getBizLogList(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [
-    {
-      1: '张三',
-      2: '男',
-      3: '1370000000',
-      4: '生产部',
-      5: '2020-02-02',
-      6: '作业中',
-    },
-    {
-      1: '李四',
-      2: '女',
-      3: '1572000000',
-      4: '运维部',
-      5: '2021-01-01',
-      6: '正常',
-    },
-  ]
-  total.value = list.value.length
-  listLoading.value = false
-}
-
-fetchData()
-
-// 打开详情对话框
-// const detail = (row: any) => {
-//   getBizLogDetail(row.id).then((res) => {
-//     if (res.code === 200) {
-//       ElMessageBox.alert(res.data, '详情', {
-//         confirmButtonText: '确定',
-//       })
-//     }
-//   })
-// }
-
-// 清空日志
-const cleanAll = () => {
-  ElMessageBox.confirm('确定要清空全部日志吗？', '确认操作', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    // delLog().then((response) => {
-    //   if (response.code === 200) {
-    //     ElMessage({
-    //       message: '删除成功',
-    //       type: 'success',
-    //     })
-    //     list.value = []
-    //     total.value = 0
-    //     // this.fetchData()
-    //   }
-    // })
+  getPersonListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
   })
 }
 
+fetchData()
 // 查询数据
 const search = () => {
   fetchData()
 }
 // 新增人员
 const add = (row: any) => {
-  // personRef.value.initDialog('create')
-  $router.push({ path: '/person/personedit' })
+  $router.push({ path: '/person/personedit', query: { type: 'add' } })
 }
 // 人脸注册
 const register = (row: any) => {
@@ -134,14 +85,8 @@
 }
 // 编辑人员
 const edit = (row: any) => {
-  // personRef.value.initDialog('update', {})
+  $router.push({ path: '/person/personedit', query: { type: 'update', row: JSON.stringify(row) } })
 }
-// 获取日志类型
-// const fetchLogType = () => {
-//   getLogType().then((response) => {
-//     logTypeList.value = response.data
-//   })
-// }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
@@ -159,6 +104,50 @@
 const multiSelect = (row: any[]) => {
   selectList.value = row
 }
+// 删除
+const del = () => {
+  if (selectList.value.length) {
+    ElMessageBox.confirm('是否删除所选的数据?', '提示', {
+      confirmButtonText: '是',
+      cancelButtonText: '否',
+      type: 'info',
+    }).then((res) => {
+      // 点击确认
+      const ids = selectList.value.map(item => item.id)
+      delPerson(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
+    }).catch(() => {
+      // 点击取消
+      selectList.value = []
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+const deptTreeList = ref([])
+// 加载组织机构树形下拉
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+// 人员状态列表
+const workerStatusList = ref<dict[]>([])
+const fetchStatusList = () => {
+  getDictByCode('workerStatus').then((response) => {
+    workerStatusList.value = response.data
+  })
+}
+fetchStatusList()
+fetchDeptTree()
 </script>
 
 <template>
@@ -169,31 +158,29 @@
       <!-- 筛选条件 -->
       <search-area @search="search">
         <search-item>
-          <el-input v-model.trim="listQuery.beginTime" placeholder="姓名" clearable />
+          <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.beginTime" clearable placeholder="所属部门">
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value"></el-option>
+          <dept-select v-model="listQuery.deptId" :data="deptTreeList" placeholder="所属部门" style="width: 100%;" />
+        </search-item>
+        <search-item>
+          <el-select v-model="listQuery.status" clearable placeholder="当前状态">
+            <el-option v-for="item in workerStatusList" :key="item.id" :label="item.name" :value="item.value"></el-option>
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.beginTime" clearable placeholder="当前状态">
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value"></el-option>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-date-picker v-model="listQuery.beginTime" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
+          <el-date-picker v-model="listQuery.startDate" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="注册开始时间" />
         </search-item>
         <search-item>
-          <el-date-picker v-model="listQuery.endTime" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
+          <el-date-picker v-model="listQuery.endDate" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="注册结束时间" />
         </search-item>
         <template #btns>
           <el-button class="search-btn" type="primary" @click="add">
             新增
           </el-button>
-          <el-button class="search-btn" type="info" >
+          <el-button class="search-btn" type="info" @click="del">
             删除
           </el-button>
         </template>
@@ -205,7 +192,7 @@
           <template #columns>
             <el-table-column label="人脸注册" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="register(scope.row)">
+                <el-button link type="primary" :disabled="scope.row.workerAvatar" size="small" @click="register(scope.row)">
                   注册
                 </el-button>
               </template>
diff --git a/src/views/person/person-interface.ts b/src/views/person/person-interface.ts
new file mode 100644
index 0000000..b7c9cf7
--- /dev/null
+++ b/src/views/person/person-interface.ts
@@ -0,0 +1,6 @@
+// 字典值类型
+export interface dict {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/person/personEdit.vue b/src/views/person/personEdit.vue
index dcff2a0..318c9ad 100644
--- a/src/views/person/personEdit.vue
+++ b/src/views/person/personEdit.vue
@@ -6,18 +6,28 @@
 <script lang="ts" setup name="personEdit">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
-import photograph from './photograph.vue'
 import { Plus } from '@element-plus/icons-vue'
+import photograph from './photograph.vue'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getDictByCode } from '@/api/system/dict'
+import { addPerson, updatePerson, uploadApi } from '@/api/person'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm: { [key: string]: string | any } = ref({
-  account: '',
-  name: '', // 姓名
+  workerName: '', // 姓名
+  gender: '',
+  deptId: '', // 所属部门
+  phoneNumber: '', // 联系方式
+  workerAvatar: '', // 照片
+  idCardNumber: '', // 身份证号
+  workerType: '1',
 }) // 表单
-const multipleTableRef = ref<InstanceType<typeof ElTable>>()
-const title = ref('')
-const staffId = ref('')
+// 图片地址
+const photoUrl = computed(() => {
+  return `${import.meta.env.VITE_APP_API_BASEURL}/static/${ruleForm.value.workerAvatar}`
+})
 const photographRef = ref()
 // 身份证号码验证规则
 const validateIDcard = (rule: any, value: any, callback: any) => {
@@ -30,27 +40,37 @@
   }
 }
 const rules = ref({
-  name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+  workerName: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+  gender: [{ required: true, message: '性别不能为空', trigger: 'blur' }],
+  deptId: [{ required: true, message: '所属部门不能为空', trigger: 'blur' }],
+  phoneNumber: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  idCardNumber: [{ required: true, message: '身份证号码不符合规范', trigger: 'blur', validator: validateIDcard }],
 }) // 表单验证规则
-// 根据身份证得到生日
-const getBirthday = () => {
-  ruleFormRef.value?.validateField('idCard').then((res) => {
-    // 获取生日
-    const IdCard = ruleForm.value.idCard
-    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
-    ruleForm.value.birthday = birthday
-    // 获取性别 第17位  奇数为男 偶数为女
-    // ruleForm.value.sex
-    if (Number(IdCard.substring(16, 17)) % 2) {
-      // 男
-      ruleForm.value.sex = '1'
-    }
-    else {
-      //  女
-      ruleForm.value.sex = '2'
+
+// 图片上传请求
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('file', file.file)
+  uploadApi(fd).then((res) => {
+    if (res.code === 200) {
+      console.log(res.data, '123')
+      ElMessage.success('上传成功')
+      ruleForm.value.workerAvatar = res.data
     }
   })
 }
+// 图片上传之前的验证
+const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png' && rawFile.type !== 'image/jpg') {
+    ElMessage.error('只能上传png/jpeg/jpg格式的图片')
+    return false
+  }
+  else if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('图片不能大于2MB')
+    return false
+  }
+  return true
+}
 // 拍照功能
 const tackPhoto = ref(false)
 const register = () => {
@@ -59,31 +79,10 @@
 }
 // 关闭摄像头
 const offPthot = (url: string) => {
-  console.log(url, '图片地址')
-  tackPhoto.value = false
-}
-// const PubList = ref<TreeStructure[]>([])
-// const PubListTree = ref([])
-// 获取组织列表
-// const getPubList = () => {
-//   getDeptTreeList().then((res) => {
-//     // 转成树结构
-//     PubList.value = res.data
-//     PubListTree.value = toTreeList(res.data, '0', true)
-//   })
-// }
-// const sexList = ref<{ id: string; value: string; name: string }[]>()
-// // 获取性别
-// const getSexList = () => {
-//   getDictByCode('sex').then((response) => {
-//     sexList.value = response.data
-//   })
-// }
-// 重置表单内容
-const resetFormData = () => {
-  ruleForm.value = {
-    name: '', // 姓名
+  if (url) {
+    ruleForm.value.workerAvatar = url
   }
+  tackPhoto.value = false
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
@@ -100,50 +99,81 @@
           type: 'warning',
         },
       ).then(() => {
+        // 更新或者新增
+        ($route.query.type === 'add' ? addPerson(ruleForm.value) : updatePerson(ruleForm.value)).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('操作成功')
+            $router.go(-1)
+          }
+        })
       })
     }
   })
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
+const resetForm = () => {
   $router.go(-1)
 }
+const deptTreeList = ref([])
+// 加载组织机构树形下拉
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+fetchDeptTree()
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sysSex').then((response) => {
+    sexList.value = response.data
+  })
+}
+getSexList()
+const title = ref('')
+onMounted(() => {
+  const type = $route.query.type
+  if (type === 'update') {
+    title.value = '人员编辑'
+    const row = JSON.parse($route.query.row as string)
+    ruleForm.value = row
+  }
+  else {
+    title.value = '人员新增'
+  }
+})
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container>
     <!-- 拍照组件 -->
-    <photograph ref="photographRef" :tack-photo="tackPhoto" @off="offPthot"/>
-    <detail-page :title="`人员新增`">
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+    <photograph ref="photographRef" :tack-photo="tackPhoto" @off="offPthot" />
+    <detail-page :title="title">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" border
+        stripe>
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item prop="minioFileName" >
-              <el-upload
-                class="avatar-uploader"
-                :show-file-list="false"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-upload="beforeAvatarUpload"
-                :disabled="title === '详情'"
-                accept="image/png, image/jpeg,image/jpg"
-              >
-                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
+            <el-form-item>
+              <el-upload class="avatar-uploader" :show-file-list="false" :http-request="uploadQuarterlyEvaluateFile"
+                :before-upload="beforeAvatarUpload" accept="image/png, image/jpeg,image/jpg">
+                <img v-if="ruleForm.workerAvatar" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
               </el-upload>
-              <el-button type="primary" style="margin-top: 20px; display: block; width: 190px;" @click="register">人脸注册</el-button>
+              <el-button type="primary" style="margin-top: 20px; display: block; width: 190px;"
+                @click="register">人脸注册</el-button>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="姓名" prop="name" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.name" placeholder="姓名" :disabled="title === '详情'">
+            <el-form-item label="姓名" prop="workerName" style="margin-top: 40px;">
+              <el-input v-model.trim="ruleForm.workerName" placeholder="姓名">
               </el-input>
             </el-form-item>
-            <el-form-item label="所属部门" prop="sex" class="marg-item" style="margin-top: 40px;">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '所属部门'" style="width: 100%;">
-                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
+            <el-form-item label="所属部门" prop="deptId" class="marg-item" style="margin-top: 40px;">
+              <dept-select v-model="ruleForm.deptId" :data="deptTreeList" placeholder="所属部门" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="职务" prop="name" style="margin-top: 40px;">
               <el-input v-model.trim="ruleForm.name" placeholder="职务" :disabled="title === '详情'">
@@ -151,17 +181,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="性别" prop="sex" class="marg-item" style="margin-top: 40px;">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
+            <el-form-item label="性别" prop="gender" class="marg-item" style="margin-top: 40px;">
+              <el-select v-model="ruleForm.gender" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="联系方式" prop="name" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.name" placeholder="联系方式" :disabled="title === '详情'">
+            <el-form-item label="联系方式" prop="phoneNumber" style="margin-top: 40px;">
+              <el-input v-model.trim="ruleForm.phoneNumber" placeholder="联系方式" :disabled="title === '详情'">
               </el-input>
             </el-form-item>
-            <el-form-item label="证件号码" prop="name" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.name" placeholder="证件号码" :disabled="title === '详情'">
+            <el-form-item label="证件号码" prop="idCardNumber" style="margin-top: 40px;">
+              <el-input v-model.trim="ruleForm.idCardNumber" placeholder="证件号码" :disabled="title === '详情'">
               </el-input>
             </el-form-item>
           </el-col>
@@ -169,10 +199,10 @@
         </el-row>
       </el-form>
       <div class="dialog-footer">
-        <el-button @click="resetForm" style="margin-left: 30px;">
+        <el-button style="margin-left: 30px;" @click="resetForm">
           取消
         </el-button>
-        <el-button :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">
           保存
         </el-button>
       </div>
@@ -181,11 +211,12 @@
 </template>
 
 <style lang="scss" scoped>
-.dialog-footer{
+.dialog-footer {
   display: flex;
   justify-items: end;
   flex-direction: row-reverse;
 }
+
 :deep(.el-radio__label) {
   display: none;
 }
@@ -206,8 +237,9 @@
 
 .isDetail {
   ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap>.el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk)>.el-form-item__label::before {
       display: none;
     }
   }
diff --git a/src/views/person/photograph.vue b/src/views/person/photograph.vue
index 488cf4f..02d4551 100644
--- a/src/views/person/photograph.vue
+++ b/src/views/person/photograph.vue
@@ -5,7 +5,7 @@
  -->
 <script lang="ts" setup name="photograph">
 import { ElMessage } from 'element-plus'
-// import { putFileAttach } from "@/api/customer/animalinfo"
+import { uploadApi } from '@/api/person'
 // 父组件传来的拍照状态 true 拍照 false 关闭拍照
 const props = defineProps({
   tackPhoto: {
@@ -23,6 +23,7 @@
 const blobFile = ref<File>()
 const mediaStreamTrack = ref('')
 const canvasRef = ref()
+const dialogFormVisible = ref(false)
 // 监听接收到拍摄状态后，开始调取摄像头权限
 watch(() => props.tackPhoto, (newVal) => {
   if (newVal) {
@@ -92,11 +93,25 @@
   // 转为本地路径
   const dataurl = canvas.toDataURL('image/jpeg')
   // 用时间戳作为文件名
-  const filenname = Date.now().toString()
+  const filenname = `${Date.now().toString()}.png`
   // 将blob文件转为文件对象
   blobFile.value = dataURLtoFile(dataurl, filenname)
   preViewVisible.value = true
 }
+//  关闭弹窗
+const close = () => {
+  const canvas = document.querySelector('#canvas-photo')
+  // 获取图片base64链接
+  // var image = canvas.toDataURL('image/png')
+  canvas.getContext('2d').clearRect(0, 0, 400, 300)// 清除画布
+  // 关闭摄像头
+  mediaStreamTrack.value.getVideoTracks().forEach((track) => {
+    track.stop()
+  })
+  blobFile.value = null
+  // 告诉父组件关闭摄像头
+  emits('off', '')
+}
 // 保存图片
 const takePhoneUpfile = () => {
   console.log(blobFile.value)
@@ -108,43 +123,28 @@
   const formData = new FormData()
   formData.append('file', blobFile.value)// 图片内容
   // 上传图片
-  // putFileAttach(formData).then(res => {// 后台接口
-  //   loadingbut.value = false
-  //   // this.$emit('picture', res.data.data); // 返回给父组件展示
-  //   props.tackPhoto = false
-  //   canvas.value.getContext('2d').clearRect(0, 0, 400, 300)// 清除画布
-  //   // 关闭摄像头
-  //   mediaStreamTrack.value.getVideoTracks().forEach(function (track) {
-  //     track.stop()
-  //   })
-  // 获取图片base64链接
-  // const canvas = document.querySelector('#canvas-photo')
-  // var image = canvas.toDataURL('image/png')
-  // // 告诉父组件关闭摄像头
-  // emits('off',image)
-  // }, (error) => {
-  //   loadingbut.value = false
-  //   window.console.log(error)
-  // })
+  uploadApi(formData).then((res) => { // 后台接口
+    loadingbut.value = false
+    blobFile.value = null
+    const canvas = document.querySelector('#canvas-photo')
+    // 获取图片base64链接
+    canvas.getContext('2d').clearRect(0, 0, 400, 300)// 清除画布
+    // 关闭摄像头
+    mediaStreamTrack.value.getVideoTracks().forEach((track) => {
+      track.stop()
+    })
+    // 告诉父组件关闭摄像头,并且把返回结果传出去
+    emits('off', res.data)
+    dialogFormVisible.value = false
+  }, (error) => {
+    loadingbut.value = false
+    window.console.log(error)
+  })
 }
-const dialogFormVisible = ref(false)
 const initDialog = () => {
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
-//  关闭弹窗
-const close = () => {
-  const canvas = document.querySelector('#canvas-photo')
-   // 获取图片base64链接
-   var image = canvas.toDataURL('image/png')
-  canvas.getContext('2d').clearRect(0, 0, 400, 300)// 清除画布
-  // 关闭摄像头
-  mediaStreamTrack.value.getVideoTracks().forEach((track) => {
-    track.stop()
-  })
-  // 告诉父组件关闭摄像头
-  emits('off', image)
-}
 </script>
 
 <template>
@@ -156,9 +156,7 @@
           <!-- 这里就是摄像头显示的画面 -->
           <video id="video-photo" width="400" height="300"></video>
           <div class="iCenter">
-            <el-button
-              type="primary" style="margin-top: 10px;"
-                       @click="takePhone">拍照</el-button>
+            <el-button type="primary" style="margin-top: 10px;" @click="takePhone">拍照</el-button>
           </div>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/scene/components/deviceListDialog.vue b/src/views/scene/components/deviceListDialog.vue
new file mode 100644
index 0000000..2733e3a
--- /dev/null
+++ b/src/views/scene/components/deviceListDialog.vue
@@ -0,0 +1,194 @@
+<!--
+  Description: 选择人员穿戴设备弹窗
+  Author: 李亚光
+  Date: 2023-04-28
+ -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getDeviceListPage } from '@/api/device'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { DictDetail } from '@/views/system/dict/dict-interface'
+const props = defineProps({
+  //  多选
+  multiple: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  deviceCode: '',
+  deviceType: '',
+  deviceStatus: '0',
+  offset: 1,
+  limit: 5,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref(0)
+const select = ref(-1)
+const deviceType = ref('') // 设备类型
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'deviceCode' },
+  {
+    text: '厂家',
+    value: 'manufacturer',
+  },
+  { text: '是否供电', value: 'isPowerSupplyName' },
+  { text: '批次', value: 'deviceBatch' },
+  { text: '注册时间', value: 'createTime' },
+])
+// 获取设备数据列表
+const fetchData = () => {
+  select.value = -1
+  getDeviceListPage(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.rows.length
+    }
+  })
+}
+// 获取设备类型
+const deviceTypeList = ref<DictDetail[]>([])
+const fetchDeviceType = () => {
+  getDictByCode('deviceType').then((response) => {
+    deviceTypeList.value = response.data
+  })
+}
+fetchDeviceType()
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 重置
+const reset = () => {
+  listQuery.value.deviceCode = ''
+  listQuery.value.offset = 1
+  listQuery.value.limit = 5
+  search()
+  selectList.value = []
+  select.value = -1
+}
+
+// 点击保存
+const submitForm = () => {
+  if (props.multiple) {
+    // 多选
+    if (selectList.value.length > 0) {
+      emits('add', selectList.value)
+      dialogFormVisible.value = false
+      reset()
+    }
+    else {
+      ElMessage.warning('请先选择设备')
+    }
+  }
+  else {
+    // 单选
+    if (select.value >= 0) {
+      const person = list.value.filter((item, index) => index == select.value)[0]
+      emits('add', Object.assign(person, { Type: deviceType.value }))
+      dialogFormVisible.value = false
+      reset()
+    }
+    else {
+      ElMessage.warning('请先选择设备')
+    }
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = (type: string) => {
+  deviceType.value = type
+  let typeName = ''
+  dialogFormVisible.value = true
+  if (type === 'hatCode') {
+    typeName = '安全帽'
+    // 安全帽
+  }
+  else if (type === 'vastCode') {
+    // 安全背心
+    typeName = '背心'
+  }
+  else if (type === 'braceletCode') {
+    // 安全手环
+    typeName = '手环'
+  }
+  else if (type === 'SafetyTree') {
+    // 安全手环
+    typeName = '安全树'
+  }
+  const devicetype = deviceTypeList.value.filter(item => item.name === typeName)[0].value
+  listQuery.value.deviceType = devicetype
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.deviceCode" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+        :list-loading="loadingTable" @change="changePage" :is-showmulti-select="props.multiple" :is-multi="props.multiple"
+        @multi-select="multiSelect">
+        <template #preColumns>
+          <el-table-column v-if="!props.multiple" label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/scene/components/personListDialog.vue b/src/views/scene/components/personListDialog.vue
new file mode 100644
index 0000000..c01e138
--- /dev/null
+++ b/src/views/scene/components/personListDialog.vue
@@ -0,0 +1,157 @@
+<!--
+  Description: 选择作业人员弹窗
+  Author: 李亚光
+  Date: 2023-04-28
+ -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getPersonListPage } from '@/api/person'
+import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  name: '',
+  // startDate: '',
+  status: '0',
+  deptId: '',
+  // endDate: '',
+  // logType: '业务日志',
+  offset: 1,
+  limit: 5,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref(0)
+const select = ref(-1)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '姓名', value: 'workerName' },
+  {
+    text: '性别',
+    value: 'genderName',
+  },
+  { text: '所在部门', value: 'deptName' },
+  { text: '联系方式', value: 'phoneNumber' },
+])
+// 获取人员数据列表
+const fetchData = () => {
+  select.value = -1
+  getPersonListPage(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.rows.length
+    }
+  })
+}
+fetchData()
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    name: '',
+    // startDate: '',
+    status: '0',
+    deptId: '',
+    // endDate: '',
+    // logType: '业务日志',
+    offset: 1,
+    limit: 5,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+const deptTreeList = ref([])
+// 加载组织机构树形下拉
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+fetchDeptTree()
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :data="deptTreeList" placeholder="所属部门" style="width: 100%;" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+        :list-loading="loadingTable" @change="changePage">
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>

diff --git a/src/api/person.ts b/src/api/person.ts
new file mode 100644
index 0000000..6593ccf
--- /dev/null
+++ b/src/api/person.ts
@@ -0,0 +1,45 @@
+/**
+ * 人员管理接口
+ */
+import request from './index'
+const prefix = 'worker'
+// 图片上传接口
+export function uploadApi(data: FormData) {
+  return request({
+    url: 'file/upload',
+    method: 'post',
+    data,
+  })
+}
+// 人员列表
+export function getPersonListPage(params: object) {
+  return request({
+    url: `${prefix}/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 更新人员
+export function updatePerson(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function addPerson(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function delPerson(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/person.ts b/src/router/modules/person.ts
index 5366ecc..4a28d39 100644
--- a/src/router/modules/person.ts
+++ b/src/router/modules/person.ts
@@ -31,7 +31,7 @@
         name: 'personedit',
         component: () => import('@/views/person/personEdit.vue'),
         meta: {
-          title: '人员编辑/:id?',
+          title: '人员编辑/:type?',
           auth: '/person',
           sidebar: false,
           breadcrumb: true,
diff --git a/src/views/device/device-interface.ts b/src/views/device/device-interface.ts
index 8e3d5f9..9205bc0 100644
--- a/src/views/device/device-interface.ts
+++ b/src/views/device/device-interface.ts
@@ -6,4 +6,10 @@
   id?: string
   isPowerSupply: string
   manufacturer: string
+  cameraIp?: string // 摄像头ip
+  cameraPort?: string // 摄像头端口
+  cameraCode?: string // 摄像头编号
+  gasCode?: string // 激甲编号
+  gasIp?: string // 激甲ip
+  gasPort?: string // 激甲端口
 }
diff --git a/src/views/device/deviceEdit.vue b/src/views/device/deviceEdit.vue
index e3f70cb..63d1474 100644
--- a/src/views/device/deviceEdit.vue
+++ b/src/views/device/deviceEdit.vue
@@ -23,6 +23,13 @@
   manufacturer: '', // 厂家
   id: '',
   createTime: '',
+  cameraIp: '', // 摄像头ip
+  cameraPort: '', // 摄像头端口
+  cameraCode: '', // 摄像头编号
+  gasCode: '', // 激甲编号
+  gasIp: '', // 激甲ip
+  gasPort: '', // 激甲端口
+
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -35,6 +42,10 @@
   deviceBatch: [{ required: true, message: '请输入设备批次', trigger: ['blur', 'change'] }],
   isPowerSupply: [{ required: true, message: '请输入设备是否供电', trigger: ['blur', 'change'] }],
   manufacturer: [{ required: true, message: '请输入设备厂家', trigger: ['blur', 'change'] }],
+  cameraPort: [{ required: true, message: '请输入摄像头端口号', trigger: ['blur', 'change'] }],
+  cameraIp: [{ required: true, message: '请输入摄像头ip', trigger: ['blur', 'change'] }],
+  gasIp: [{ required: true, message: '请输入激甲ip', trigger: ['blur', 'change'] }],
+  gasPort: [{ required: true, message: '请输入激甲端口号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -47,8 +58,14 @@
     manufacturer: '', // 厂家
     id: '',
     createTime: '',
+    cameraIp: '', // 摄像头ip
+    cameraPort: '', // 摄像头端口
+    cameraCode: '', // 摄像头编号
+    gasCode: '', // 激甲编号
+    gasIp: '', // 激甲ip
+    gasPort: '', // 激甲端口
   }
-  dataFormRef.value.clearValidate()
+  // dataFormRef.value.clearValidate()
 }
 // 获取设备类型
 const deviceTypeList = ref()
@@ -73,7 +90,6 @@
   dialogFormVisible.value = true
   btnLoading.value = false
   if (dialogStatus.value === 'create') { // 如果是新增，清除验证
-    console.log('新增')
     resetForm()
     isEditMode.value = false
     nextTick(() => {
@@ -81,7 +97,6 @@
     })
   }
   else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
-    console.log('编辑')
     deviceForm.value = {
       deviceType: row.deviceType, // 设备类型
       deviceCode: row.deviceCode, // 设备编号
@@ -90,6 +105,12 @@
       manufacturer: row.manufacturer, // 厂家
       id: row.id,
       createTime: row.createTime,
+      cameraIp: row.cameraIp, // 摄像头ip
+      cameraPort: row.cameraPort, // 摄像头端口
+      cameraCode: row.cameraCode, // 摄像头编号
+      gasCode: row.gasCode, // 激甲编号
+      gasIp: row.gasIp, // 激甲ip
+      gasPort: row.gasPort, // 激甲端口
     }
     isEditMode.value = true
   }
@@ -162,11 +183,20 @@
   dialogFormVisible.value = false
   resetForm()
 }
+// 是否安全帽
+const isANQUANMAO = computed(() => {
+  if (deviceTypeList.value.length) {
+    return deviceTypeList.value.filter((item: any) => item.value === deviceForm.value.deviceType)[0]?.name === '安全树'
+  }
+  else {
+    return false
+  }
+})
 </script>
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
-    <el-form ref="dataFormRef" :rules="rules" :model="deviceForm" label-position="right" label-width="80px">
+    <el-form ref="dataFormRef" :rules="rules" :model="deviceForm" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
@@ -203,6 +233,30 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row v-if="isANQUANMAO" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="激光甲烷IP" prop="gasIp">
+            <el-input v-model.trim="deviceForm.gasIp" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="激光甲烷端口" prop="gasPort">
+            <el-input v-model.trim="deviceForm.gasPort" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isANQUANMAO" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="摄像头IP" prop="cameraIp">
+            <el-input v-model.trim="deviceForm.cameraIp" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="摄像头端口" prop="cameraPort">
+            <el-input v-model.trim="deviceForm.cameraPort" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index fc0240c..0fcc508 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -17,12 +17,12 @@
   deviceCode: '',
   deviceType: '',
   offset: 1,
-  limit: 20,
+  limit: 5,
 })
 const columns = ref<TableColumn[]>([
   {
     text: '设备类型',
-    value: 'deviceType',
+    value: 'deviceTypeName',
     align: 'center',
     // width: 170,
   },
@@ -39,7 +39,7 @@
   },
   {
     text: '是否供电',
-    value: 'isPowerSupply',
+    value: 'isPowerSupplyName',
     align: 'center',
   },
   {
@@ -54,7 +54,7 @@
   },
   {
     text: '当前状态',
-    value: '7',
+    value: 'statusName',
     align: 'center',
   },
 ])
@@ -142,6 +142,7 @@
   <div class="list-log">
     <!-- 布局 -->
     <app-container>
+      <!-- 人员编辑 -->
       <edit-list ref="editRef" @watch-child="search" />
       <!-- 筛选条件 -->
       <search-area @search="search">
diff --git a/src/views/person/index.vue b/src/views/person/index.vue
index 75f6b22..f36b253 100644
--- a/src/views/person/index.vue
+++ b/src/views/person/index.vue
@@ -6,11 +6,19 @@
 <script lang="ts" setup name="person">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import type { dict } from './person-interface'
+import { delPerson, getPersonListPage } from '@/api/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getDictByCode } from '@/api/system/dict'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  beginTime: '',
-  endTime: '',
+  name: '',
+  startDate: '',
+  status: '',
+  deptId: '',
+  endDate: '',
   // logType: '业务日志',
   offset: 1,
   limit: 20,
@@ -18,115 +26,58 @@
 const columns = ref([
   {
     text: '姓名',
-    value: '1',
+    value: 'workerName',
     align: 'center',
     // width: 170,
   },
   {
     text: '性别',
-    value: '2',
+    value: 'genderName',
     align: 'center',
     // width: 100,
   },
   {
     text: '联系方式',
-    value: '3',
+    value: 'phoneNumber',
     align: 'center',
   },
   {
     text: '所属部门',
-    value: '4',
+    value: 'deptName',
     align: 'center',
   },
   {
     text: '注册时间',
-    value: '5',
+    value: 'createTime',
     align: 'center',
   },
   {
     text: '当前状态',
-    value: '6',
+    value: 'statusName',
     align: 'center',
   },
 ])
 const list = ref([])
 const total = ref(20)
-const logTypeList = ref(null)
 const listLoading = ref(true)
-const dialogFormVisible = ref(false)
-const dialogStatus = ref('')
-// 获取日志数据
+// 获取列表
 const fetchData = () => {
   listLoading.value = true
-  // getBizLogList(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [
-    {
-      1: '张三',
-      2: '男',
-      3: '1370000000',
-      4: '生产部',
-      5: '2020-02-02',
-      6: '作业中',
-    },
-    {
-      1: '李四',
-      2: '女',
-      3: '1572000000',
-      4: '运维部',
-      5: '2021-01-01',
-      6: '正常',
-    },
-  ]
-  total.value = list.value.length
-  listLoading.value = false
-}
-
-fetchData()
-
-// 打开详情对话框
-// const detail = (row: any) => {
-//   getBizLogDetail(row.id).then((res) => {
-//     if (res.code === 200) {
-//       ElMessageBox.alert(res.data, '详情', {
-//         confirmButtonText: '确定',
-//       })
-//     }
-//   })
-// }
-
-// 清空日志
-const cleanAll = () => {
-  ElMessageBox.confirm('确定要清空全部日志吗？', '确认操作', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    // delLog().then((response) => {
-    //   if (response.code === 200) {
-    //     ElMessage({
-    //       message: '删除成功',
-    //       type: 'success',
-    //     })
-    //     list.value = []
-    //     total.value = 0
-    //     // this.fetchData()
-    //   }
-    // })
+  getPersonListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
   })
 }
 
+fetchData()
 // 查询数据
 const search = () => {
   fetchData()
 }
 // 新增人员
 const add = (row: any) => {
-  // personRef.value.initDialog('create')
-  $router.push({ path: '/person/personedit' })
+  $router.push({ path: '/person/personedit', query: { type: 'add' } })
 }
 // 人脸注册
 const register = (row: any) => {
@@ -134,14 +85,8 @@
 }
 // 编辑人员
 const edit = (row: any) => {
-  // personRef.value.initDialog('update', {})
+  $router.push({ path: '/person/personedit', query: { type: 'update', row: JSON.stringify(row) } })
 }
-// 获取日志类型
-// const fetchLogType = () => {
-//   getLogType().then((response) => {
-//     logTypeList.value = response.data
-//   })
-// }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
@@ -159,6 +104,50 @@
 const multiSelect = (row: any[]) => {
   selectList.value = row
 }
+// 删除
+const del = () => {
+  if (selectList.value.length) {
+    ElMessageBox.confirm('是否删除所选的数据?', '提示', {
+      confirmButtonText: '是',
+      cancelButtonText: '否',
+      type: 'info',
+    }).then((res) => {
+      // 点击确认
+      const ids = selectList.value.map(item => item.id)
+      delPerson(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
+    }).catch(() => {
+      // 点击取消
+      selectList.value = []
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+const deptTreeList = ref([])
+// 加载组织机构树形下拉
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+// 人员状态列表
+const workerStatusList = ref<dict[]>([])
+const fetchStatusList = () => {
+  getDictByCode('workerStatus').then((response) => {
+    workerStatusList.value = response.data
+  })
+}
+fetchStatusList()
+fetchDeptTree()
 </script>
 
 <template>
@@ -169,31 +158,29 @@
       <!-- 筛选条件 -->
       <search-area @search="search">
         <search-item>
-          <el-input v-model.trim="listQuery.beginTime" placeholder="姓名" clearable />
+          <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.beginTime" clearable placeholder="所属部门">
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value"></el-option>
+          <dept-select v-model="listQuery.deptId" :data="deptTreeList" placeholder="所属部门" style="width: 100%;" />
+        </search-item>
+        <search-item>
+          <el-select v-model="listQuery.status" clearable placeholder="当前状态">
+            <el-option v-for="item in workerStatusList" :key="item.id" :label="item.name" :value="item.value"></el-option>
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.beginTime" clearable placeholder="当前状态">
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value"></el-option>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-date-picker v-model="listQuery.beginTime" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
+          <el-date-picker v-model="listQuery.startDate" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="注册开始时间" />
         </search-item>
         <search-item>
-          <el-date-picker v-model="listQuery.endTime" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
+          <el-date-picker v-model="listQuery.endDate" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="注册结束时间" />
         </search-item>
         <template #btns>
           <el-button class="search-btn" type="primary" @click="add">
             新增
           </el-button>
-          <el-button class="search-btn" type="info" >
+          <el-button class="search-btn" type="info" @click="del">
             删除
           </el-button>
         </template>
@@ -205,7 +192,7 @@
           <template #columns>
             <el-table-column label="人脸注册" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="register(scope.row)">
+                <el-button link type="primary" :disabled="scope.row.workerAvatar" size="small" @click="register(scope.row)">
                   注册
                 </el-button>
               </template>
diff --git a/src/views/person/person-interface.ts b/src/views/person/person-interface.ts
new file mode 100644
index 0000000..b7c9cf7
--- /dev/null
+++ b/src/views/person/person-interface.ts
@@ -0,0 +1,6 @@
+// 字典值类型
+export interface dict {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/person/personEdit.vue b/src/views/person/personEdit.vue
index dcff2a0..318c9ad 100644
--- a/src/views/person/personEdit.vue
+++ b/src/views/person/personEdit.vue
@@ -6,18 +6,28 @@
 <script lang="ts" setup name="personEdit">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
-import photograph from './photograph.vue'
 import { Plus } from '@element-plus/icons-vue'
+import photograph from './photograph.vue'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getDictByCode } from '@/api/system/dict'
+import { addPerson, updatePerson, uploadApi } from '@/api/person'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm: { [key: string]: string | any } = ref({
-  account: '',
-  name: '', // 姓名
+  workerName: '', // 姓名
+  gender: '',
+  deptId: '', // 所属部门
+  phoneNumber: '', // 联系方式
+  workerAvatar: '', // 照片
+  idCardNumber: '', // 身份证号
+  workerType: '1',
 }) // 表单
-const multipleTableRef = ref<InstanceType<typeof ElTable>>()
-const title = ref('')
-const staffId = ref('')
+// 图片地址
+const photoUrl = computed(() => {
+  return `${import.meta.env.VITE_APP_API_BASEURL}/static/${ruleForm.value.workerAvatar}`
+})
 const photographRef = ref()
 // 身份证号码验证规则
 const validateIDcard = (rule: any, value: any, callback: any) => {
@@ -30,27 +40,37 @@
   }
 }
 const rules = ref({
-  name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+  workerName: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+  gender: [{ required: true, message: '性别不能为空', trigger: 'blur' }],
+  deptId: [{ required: true, message: '所属部门不能为空', trigger: 'blur' }],
+  phoneNumber: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  idCardNumber: [{ required: true, message: '身份证号码不符合规范', trigger: 'blur', validator: validateIDcard }],
 }) // 表单验证规则
-// 根据身份证得到生日
-const getBirthday = () => {
-  ruleFormRef.value?.validateField('idCard').then((res) => {
-    // 获取生日
-    const IdCard = ruleForm.value.idCard
-    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
-    ruleForm.value.birthday = birthday
-    // 获取性别 第17位  奇数为男 偶数为女
-    // ruleForm.value.sex
-    if (Number(IdCard.substring(16, 17)) % 2) {
-      // 男
-      ruleForm.value.sex = '1'
-    }
-    else {
-      //  女
-      ruleForm.value.sex = '2'
+
+// 图片上传请求
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('file', file.file)
+  uploadApi(fd).then((res) => {
+    if (res.code === 200) {
+      console.log(res.data, '123')
+      ElMessage.success('上传成功')
+      ruleForm.value.workerAvatar = res.data
     }
   })
 }
+// 图片上传之前的验证
+const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png' && rawFile.type !== 'image/jpg') {
+    ElMessage.error('只能上传png/jpeg/jpg格式的图片')
+    return false
+  }
+  else if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('图片不能大于2MB')
+    return false
+  }
+  return true
+}
 // 拍照功能
 const tackPhoto = ref(false)
 const register = () => {
@@ -59,31 +79,10 @@
 }
 // 关闭摄像头
 const offPthot = (url: string) => {
-  console.log(url, '图片地址')
-  tackPhoto.value = false
-}
-// const PubList = ref<TreeStructure[]>([])
-// const PubListTree = ref([])
-// 获取组织列表
-// const getPubList = () => {
-//   getDeptTreeList().then((res) => {
-//     // 转成树结构
-//     PubList.value = res.data
-//     PubListTree.value = toTreeList(res.data, '0', true)
-//   })
-// }
-// const sexList = ref<{ id: string; value: string; name: string }[]>()
-// // 获取性别
-// const getSexList = () => {
-//   getDictByCode('sex').then((response) => {
-//     sexList.value = response.data
-//   })
-// }
-// 重置表单内容
-const resetFormData = () => {
-  ruleForm.value = {
-    name: '', // 姓名
+  if (url) {
+    ruleForm.value.workerAvatar = url
   }
+  tackPhoto.value = false
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
@@ -100,50 +99,81 @@
           type: 'warning',
         },
       ).then(() => {
+        // 更新或者新增
+        ($route.query.type === 'add' ? addPerson(ruleForm.value) : updatePerson(ruleForm.value)).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('操作成功')
+            $router.go(-1)
+          }
+        })
       })
     }
   })
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
+const resetForm = () => {
   $router.go(-1)
 }
+const deptTreeList = ref([])
+// 加载组织机构树形下拉
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+fetchDeptTree()
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sysSex').then((response) => {
+    sexList.value = response.data
+  })
+}
+getSexList()
+const title = ref('')
+onMounted(() => {
+  const type = $route.query.type
+  if (type === 'update') {
+    title.value = '人员编辑'
+    const row = JSON.parse($route.query.row as string)
+    ruleForm.value = row
+  }
+  else {
+    title.value = '人员新增'
+  }
+})
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container>
     <!-- 拍照组件 -->
-    <photograph ref="photographRef" :tack-photo="tackPhoto" @off="offPthot"/>
-    <detail-page :title="`人员新增`">
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+    <photograph ref="photographRef" :tack-photo="tackPhoto" @off="offPthot" />
+    <detail-page :title="title">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" border
+        stripe>
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item prop="minioFileName" >
-              <el-upload
-                class="avatar-uploader"
-                :show-file-list="false"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-upload="beforeAvatarUpload"
-                :disabled="title === '详情'"
-                accept="image/png, image/jpeg,image/jpg"
-              >
-                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
+            <el-form-item>
+              <el-upload class="avatar-uploader" :show-file-list="false" :http-request="uploadQuarterlyEvaluateFile"
+                :before-upload="beforeAvatarUpload" accept="image/png, image/jpeg,image/jpg">
+                <img v-if="ruleForm.workerAvatar" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
               </el-upload>
-              <el-button type="primary" style="margin-top: 20px; display: block; width: 190px;" @click="register">人脸注册</el-button>
+              <el-button type="primary" style="margin-top: 20px; display: block; width: 190px;"
+                @click="register">人脸注册</el-button>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="姓名" prop="name" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.name" placeholder="姓名" :disabled="title === '详情'">
+            <el-form-item label="姓名" prop="workerName" style="margin-top: 40px;">
+              <el-input v-model.trim="ruleForm.workerName" placeholder="姓名">
               </el-input>
             </el-form-item>
-            <el-form-item label="所属部门" prop="sex" class="marg-item" style="margin-top: 40px;">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '所属部门'" style="width: 100%;">
-                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
+            <el-form-item label="所属部门" prop="deptId" class="marg-item" style="margin-top: 40px;">
+              <dept-select v-model="ruleForm.deptId" :data="deptTreeList" placeholder="所属部门" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="职务" prop="name" style="margin-top: 40px;">
               <el-input v-model.trim="ruleForm.name" placeholder="职务" :disabled="title === '详情'">
@@ -151,17 +181,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="性别" prop="sex" class="marg-item" style="margin-top: 40px;">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
+            <el-form-item label="性别" prop="gender" class="marg-item" style="margin-top: 40px;">
+              <el-select v-model="ruleForm.gender" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="联系方式" prop="name" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.name" placeholder="联系方式" :disabled="title === '详情'">
+            <el-form-item label="联系方式" prop="phoneNumber" style="margin-top: 40px;">
+              <el-input v-model.trim="ruleForm.phoneNumber" placeholder="联系方式" :disabled="title === '详情'">
               </el-input>
             </el-form-item>
-            <el-form-item label="证件号码" prop="name" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.name" placeholder="证件号码" :disabled="title === '详情'">
+            <el-form-item label="证件号码" prop="idCardNumber" style="margin-top: 40px;">
+              <el-input v-model.trim="ruleForm.idCardNumber" placeholder="证件号码" :disabled="title === '详情'">
               </el-input>
             </el-form-item>
           </el-col>
@@ -169,10 +199,10 @@
         </el-row>
       </el-form>
       <div class="dialog-footer">
-        <el-button @click="resetForm" style="margin-left: 30px;">
+        <el-button style="margin-left: 30px;" @click="resetForm">
           取消
         </el-button>
-        <el-button :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">
           保存
         </el-button>
       </div>
@@ -181,11 +211,12 @@
 </template>
 
 <style lang="scss" scoped>
-.dialog-footer{
+.dialog-footer {
   display: flex;
   justify-items: end;
   flex-direction: row-reverse;
 }
+
 :deep(.el-radio__label) {
   display: none;
 }
@@ -206,8 +237,9 @@
 
 .isDetail {
   ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap>.el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk)>.el-form-item__label::before {
       display: none;
     }
   }
diff --git a/src/views/person/photograph.vue b/src/views/person/photograph.vue
index 488cf4f..02d4551 100644
--- a/src/views/person/photograph.vue
+++ b/src/views/person/photograph.vue
@@ -5,7 +5,7 @@
  -->
 <script lang="ts" setup name="photograph">
 import { ElMessage } from 'element-plus'
-// import { putFileAttach } from "@/api/customer/animalinfo"
+import { uploadApi } from '@/api/person'
 // 父组件传来的拍照状态 true 拍照 false 关闭拍照
 const props = defineProps({
   tackPhoto: {
@@ -23,6 +23,7 @@
 const blobFile = ref<File>()
 const mediaStreamTrack = ref('')
 const canvasRef = ref()
+const dialogFormVisible = ref(false)
 // 监听接收到拍摄状态后，开始调取摄像头权限
 watch(() => props.tackPhoto, (newVal) => {
   if (newVal) {
@@ -92,11 +93,25 @@
   // 转为本地路径
   const dataurl = canvas.toDataURL('image/jpeg')
   // 用时间戳作为文件名
-  const filenname = Date.now().toString()
+  const filenname = `${Date.now().toString()}.png`
   // 将blob文件转为文件对象
   blobFile.value = dataURLtoFile(dataurl, filenname)
   preViewVisible.value = true
 }
+//  关闭弹窗
+const close = () => {
+  const canvas = document.querySelector('#canvas-photo')
+  // 获取图片base64链接
+  // var image = canvas.toDataURL('image/png')
+  canvas.getContext('2d').clearRect(0, 0, 400, 300)// 清除画布
+  // 关闭摄像头
+  mediaStreamTrack.value.getVideoTracks().forEach((track) => {
+    track.stop()
+  })
+  blobFile.value = null
+  // 告诉父组件关闭摄像头
+  emits('off', '')
+}
 // 保存图片
 const takePhoneUpfile = () => {
   console.log(blobFile.value)
@@ -108,43 +123,28 @@
   const formData = new FormData()
   formData.append('file', blobFile.value)// 图片内容
   // 上传图片
-  // putFileAttach(formData).then(res => {// 后台接口
-  //   loadingbut.value = false
-  //   // this.$emit('picture', res.data.data); // 返回给父组件展示
-  //   props.tackPhoto = false
-  //   canvas.value.getContext('2d').clearRect(0, 0, 400, 300)// 清除画布
-  //   // 关闭摄像头
-  //   mediaStreamTrack.value.getVideoTracks().forEach(function (track) {
-  //     track.stop()
-  //   })
-  // 获取图片base64链接
-  // const canvas = document.querySelector('#canvas-photo')
-  // var image = canvas.toDataURL('image/png')
-  // // 告诉父组件关闭摄像头
-  // emits('off',image)
-  // }, (error) => {
-  //   loadingbut.value = false
-  //   window.console.log(error)
-  // })
+  uploadApi(formData).then((res) => { // 后台接口
+    loadingbut.value = false
+    blobFile.value = null
+    const canvas = document.querySelector('#canvas-photo')
+    // 获取图片base64链接
+    canvas.getContext('2d').clearRect(0, 0, 400, 300)// 清除画布
+    // 关闭摄像头
+    mediaStreamTrack.value.getVideoTracks().forEach((track) => {
+      track.stop()
+    })
+    // 告诉父组件关闭摄像头,并且把返回结果传出去
+    emits('off', res.data)
+    dialogFormVisible.value = false
+  }, (error) => {
+    loadingbut.value = false
+    window.console.log(error)
+  })
 }
-const dialogFormVisible = ref(false)
 const initDialog = () => {
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
-//  关闭弹窗
-const close = () => {
-  const canvas = document.querySelector('#canvas-photo')
-   // 获取图片base64链接
-   var image = canvas.toDataURL('image/png')
-  canvas.getContext('2d').clearRect(0, 0, 400, 300)// 清除画布
-  // 关闭摄像头
-  mediaStreamTrack.value.getVideoTracks().forEach((track) => {
-    track.stop()
-  })
-  // 告诉父组件关闭摄像头
-  emits('off', image)
-}
 </script>
 
 <template>
@@ -156,9 +156,7 @@
           <!-- 这里就是摄像头显示的画面 -->
           <video id="video-photo" width="400" height="300"></video>
           <div class="iCenter">
-            <el-button
-              type="primary" style="margin-top: 10px;"
-                       @click="takePhone">拍照</el-button>
+            <el-button type="primary" style="margin-top: 10px;" @click="takePhone">拍照</el-button>
           </div>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/scene/components/deviceListDialog.vue b/src/views/scene/components/deviceListDialog.vue
new file mode 100644
index 0000000..2733e3a
--- /dev/null
+++ b/src/views/scene/components/deviceListDialog.vue
@@ -0,0 +1,194 @@
+<!--
+  Description: 选择人员穿戴设备弹窗
+  Author: 李亚光
+  Date: 2023-04-28
+ -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getDeviceListPage } from '@/api/device'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { DictDetail } from '@/views/system/dict/dict-interface'
+const props = defineProps({
+  //  多选
+  multiple: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  deviceCode: '',
+  deviceType: '',
+  deviceStatus: '0',
+  offset: 1,
+  limit: 5,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref(0)
+const select = ref(-1)
+const deviceType = ref('') // 设备类型
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'deviceCode' },
+  {
+    text: '厂家',
+    value: 'manufacturer',
+  },
+  { text: '是否供电', value: 'isPowerSupplyName' },
+  { text: '批次', value: 'deviceBatch' },
+  { text: '注册时间', value: 'createTime' },
+])
+// 获取设备数据列表
+const fetchData = () => {
+  select.value = -1
+  getDeviceListPage(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.rows.length
+    }
+  })
+}
+// 获取设备类型
+const deviceTypeList = ref<DictDetail[]>([])
+const fetchDeviceType = () => {
+  getDictByCode('deviceType').then((response) => {
+    deviceTypeList.value = response.data
+  })
+}
+fetchDeviceType()
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 重置
+const reset = () => {
+  listQuery.value.deviceCode = ''
+  listQuery.value.offset = 1
+  listQuery.value.limit = 5
+  search()
+  selectList.value = []
+  select.value = -1
+}
+
+// 点击保存
+const submitForm = () => {
+  if (props.multiple) {
+    // 多选
+    if (selectList.value.length > 0) {
+      emits('add', selectList.value)
+      dialogFormVisible.value = false
+      reset()
+    }
+    else {
+      ElMessage.warning('请先选择设备')
+    }
+  }
+  else {
+    // 单选
+    if (select.value >= 0) {
+      const person = list.value.filter((item, index) => index == select.value)[0]
+      emits('add', Object.assign(person, { Type: deviceType.value }))
+      dialogFormVisible.value = false
+      reset()
+    }
+    else {
+      ElMessage.warning('请先选择设备')
+    }
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = (type: string) => {
+  deviceType.value = type
+  let typeName = ''
+  dialogFormVisible.value = true
+  if (type === 'hatCode') {
+    typeName = '安全帽'
+    // 安全帽
+  }
+  else if (type === 'vastCode') {
+    // 安全背心
+    typeName = '背心'
+  }
+  else if (type === 'braceletCode') {
+    // 安全手环
+    typeName = '手环'
+  }
+  else if (type === 'SafetyTree') {
+    // 安全手环
+    typeName = '安全树'
+  }
+  const devicetype = deviceTypeList.value.filter(item => item.name === typeName)[0].value
+  listQuery.value.deviceType = devicetype
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.deviceCode" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+        :list-loading="loadingTable" @change="changePage" :is-showmulti-select="props.multiple" :is-multi="props.multiple"
+        @multi-select="multiSelect">
+        <template #preColumns>
+          <el-table-column v-if="!props.multiple" label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/scene/components/personListDialog.vue b/src/views/scene/components/personListDialog.vue
new file mode 100644
index 0000000..c01e138
--- /dev/null
+++ b/src/views/scene/components/personListDialog.vue
@@ -0,0 +1,157 @@
+<!--
+  Description: 选择作业人员弹窗
+  Author: 李亚光
+  Date: 2023-04-28
+ -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getPersonListPage } from '@/api/person'
+import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  name: '',
+  // startDate: '',
+  status: '0',
+  deptId: '',
+  // endDate: '',
+  // logType: '业务日志',
+  offset: 1,
+  limit: 5,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref(0)
+const select = ref(-1)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '姓名', value: 'workerName' },
+  {
+    text: '性别',
+    value: 'genderName',
+  },
+  { text: '所在部门', value: 'deptName' },
+  { text: '联系方式', value: 'phoneNumber' },
+])
+// 获取人员数据列表
+const fetchData = () => {
+  select.value = -1
+  getPersonListPage(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.rows.length
+    }
+  })
+}
+fetchData()
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    name: '',
+    // startDate: '',
+    status: '0',
+    deptId: '',
+    // endDate: '',
+    // logType: '业务日志',
+    offset: 1,
+    limit: 5,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+const deptTreeList = ref([])
+// 加载组织机构树形下拉
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+fetchDeptTree()
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :data="deptTreeList" placeholder="所属部门" style="width: 100%;" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+        :list-loading="loadingTable" @change="changePage">
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/scene/components/personTable.vue b/src/views/scene/components/personTable.vue
index 0095120..35e82c3 100644
--- a/src/views/scene/components/personTable.vue
+++ b/src/views/scene/components/personTable.vue
@@ -4,41 +4,153 @@
   Date: 2023-04-24
  -->
 <script lang="ts" setup name="addOperatives">
+import { ElMessage } from 'element-plus'
+import userList from './personListDialog.vue'
+import deviceList from './deviceListDialog.vue'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+
+const userListData = ref<any[]>([])
 // 表格被选中的行
 const selectList = ref<any[]>([])
 // 表格多选
 const multiSelect = (row: any[]) => {
   selectList.value = row
 }
+const deptTreeList = ref([])
+const deptList = ref([])
+// 加载组织机构树形下拉
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptList.value = res.data
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+fetchDeptTree()
+const selectPersonRef = ref()
+const selectDeviceRef = ref()
+// 当前正在操作的人员
+const personIndex = ref(0)
+// 选择作业人员
+const selectPerson = (index: any) => {
+  personIndex.value = index
+  selectPersonRef.value.initDialog()
+}
+// 选择设备
+const selectDevice = (index: number, type: string) => {
+  personIndex.value = index
+  selectDeviceRef.value.initDialog(type)
+}
+// 选中的作业人员
+const confirmPerson = (row: any) => {
+  const person = userListData.value[personIndex.value]
+  person.workerName = row.workerName
+  person.phoneNumber = row.phoneNumber
+  person.deptId = row.deptId
+}
+// 选中的设备
+const confirmDevice = (row: any) => {
+  const person = userListData.value[personIndex.value]
+  const type = row.Type
+  person[type] = row.deviceCode
+}
+// 新增人员
+const add = () => {
+  userListData.value.push({
+    edit: true,
+    workerName: '',
+    phoneNumber: '',
+    deptId: '',
+    braceletCode: '', // 手环编号
+    hatCode: '', // 安全帽编号
+    vastCode: '', // 背心编号
+    id: '', // 人员id
+  })
+}
+// 删除人员
+const del = () => {
+
+}
+// 编辑人员
+const edit = (index: number) => {
+  userListData.value[index].edit = true
+}
+// 完成编辑
+const complete = (index: number) => {
+  if (!userListData.value[index].workerName) {
+    ElMessage.warning('请先填写完整信息')
+    return false
+  }
+  userListData.value[index].edit = false
+}
 </script>
 
 <template>
   <table-container title="新增作业人员">
+    <!-- 选择作业人员弹窗 -->
+    <user-list ref="selectPersonRef" @add="confirmPerson" />
+    <!-- 选择设备弹窗 -->
+    <device-list ref="selectDeviceRef" @add="confirmDevice" />
     <template #btns-right>
-      <el-button type="primary">新增</el-button>
-      <el-button type="info">删除</el-button>
+      <el-button type="primary" @click="add">新增</el-button>
+      <el-button type="info" @click="del">删除</el-button>
     </template>
     <!-- 查询结果Table显示 -->
-    <normal-table :data="[{}]" :columns="[]" :pagination="false" :is-showmulti-select="true" :is-multi="true"
+    <normal-table :data="userListData" :pagination="false" :is-showmulti-select="true" :is-multi="true"
       @multi-select="multiSelect">
       <template #columns>
         <el-table-column label="姓名" align="center">
+          <template #default="scope">
+            <el-input v-if="scope.row.edit" v-model.trim="scope.row.workerName" placeholder="姓名"
+              @focus="selectPerson(scope.$index)" />
+            <div v-else style="height:32px;line-height: 32px;">{{ scope.row.workerName }}</div>
+          </template>
         </el-table-column>
         <el-table-column label="联系方式" align="center">
+          <template #default="scope">
+            <el-input v-if="scope.row.edit" v-model.trim="scope.row.phoneNumber" placeholder="联系方式" />
+            <div v-else style="height:32px;line-height: 32px;">{{ scope.row.phoneNumber }}</div>
+          </template>
         </el-table-column>
         <el-table-column label="所属部门" align="center">
+          <template #default="scope">
+            <dept-select v-if="scope.row.edit" v-model="scope.row.deptId" :data="deptTreeList" placeholder="所属部门"
+              style="width: 100%;" />
+            <div v-else style="height:32px;line-height: 32px;"> {{ deptList.filter((item: any) => item.id
+              === scope.row.deptId)[0]?.name }} </div>
+          </template>
         </el-table-column>
         <el-table-column label="挂载安全帽编号" align="center">
+          <template #default="scope">
+            <el-input v-if="scope.row.edit" v-model.trim="scope.row.hatCode" placeholder="安全帽编号"
+              @focus="selectDevice(scope.$index, 'hatCode')" />
+            <div v-else style="height:32px;line-height: 32px;">{{ scope.row.hatCode }}</div>
+          </template>
         </el-table-column>
         <el-table-column label="挂载背心编号" align="center">
+          <template #default="scope">
+            <el-input v-if="scope.row.edit" v-model.trim="scope.row.vastCode" placeholder="背心编号"
+              @focus="selectDevice(scope.$index, 'vastCode')" />
+              <div v-else style="height:32px;line-height: 32px;">{{ scope.row.vastCode }}</div>
+          </template>
         </el-table-column>
         <el-table-column label="挂载手环编号" align="center">
+          <template #default="scope">
+            <el-input v-if="scope.row.edit" v-model.trim="scope.row.braceletCode" placeholder="手环编号"
+              @focus="selectDevice(scope.$index, 'braceletCode')" />
+              <div v-else style="height:32px;line-height: 32px;">{{ scope.row.braceletCode }}</div>
+          </template>
         </el-table-column>
         <el-table-column label="操作" align="center">
           <template #default="scope">
-            <el-button link type="primary" size="small" @click="detail(scope.row)">
+            <el-button v-if="!scope.row.edit" link type="primary" size="small" @click="edit(scope.$index)">
               编辑
             </el-button>
+            <el-button v-else link type="primary" size="small" @click="complete(scope.$index)">
+              完成
+            </el-button>
           </template>
         </el-table-column>
       </template>
@@ -59,5 +171,4 @@
     margin-bottom: 0 !important;
   }
 
-}
-</style>
+}</style>

diff --git a/src/api/person.ts b/src/api/person.ts
new file mode 100644
index 0000000..6593ccf
--- /dev/null
+++ b/src/api/person.ts
@@ -0,0 +1,45 @@
+/**
+ * 人员管理接口
+ */
+import request from './index'
+const prefix = 'worker'
+// 图片上传接口
+export function uploadApi(data: FormData) {
+  return request({
+    url: 'file/upload',
+    method: 'post',
+    data,
+  })
+}
+// 人员列表
+export function getPersonListPage(params: object) {
+  return request({
+    url: `${prefix}/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 更新人员
+export function updatePerson(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function addPerson(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function delPerson(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/person.ts b/src/router/modules/person.ts
index 5366ecc..4a28d39 100644
--- a/src/router/modules/person.ts
+++ b/src/router/modules/person.ts
@@ -31,7 +31,7 @@
         name: 'personedit',
         component: () => import('@/views/person/personEdit.vue'),
         meta: {
-          title: '人员编辑/:id?',
+          title: '人员编辑/:type?',
           auth: '/person',
           sidebar: false,
           breadcrumb: true,
diff --git a/src/views/device/device-interface.ts b/src/views/device/device-interface.ts
index 8e3d5f9..9205bc0 100644
--- a/src/views/device/device-interface.ts
+++ b/src/views/device/device-interface.ts
@@ -6,4 +6,10 @@
   id?: string
   isPowerSupply: string
   manufacturer: string
+  cameraIp?: string // 摄像头ip
+  cameraPort?: string // 摄像头端口
+  cameraCode?: string // 摄像头编号
+  gasCode?: string // 激甲编号
+  gasIp?: string // 激甲ip
+  gasPort?: string // 激甲端口
 }
diff --git a/src/views/device/deviceEdit.vue b/src/views/device/deviceEdit.vue
index e3f70cb..63d1474 100644
--- a/src/views/device/deviceEdit.vue
+++ b/src/views/device/deviceEdit.vue
@@ -23,6 +23,13 @@
   manufacturer: '', // 厂家
   id: '',
   createTime: '',
+  cameraIp: '', // 摄像头ip
+  cameraPort: '', // 摄像头端口
+  cameraCode: '', // 摄像头编号
+  gasCode: '', // 激甲编号
+  gasIp: '', // 激甲ip
+  gasPort: '', // 激甲端口
+
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -35,6 +42,10 @@
   deviceBatch: [{ required: true, message: '请输入设备批次', trigger: ['blur', 'change'] }],
   isPowerSupply: [{ required: true, message: '请输入设备是否供电', trigger: ['blur', 'change'] }],
   manufacturer: [{ required: true, message: '请输入设备厂家', trigger: ['blur', 'change'] }],
+  cameraPort: [{ required: true, message: '请输入摄像头端口号', trigger: ['blur', 'change'] }],
+  cameraIp: [{ required: true, message: '请输入摄像头ip', trigger: ['blur', 'change'] }],
+  gasIp: [{ required: true, message: '请输入激甲ip', trigger: ['blur', 'change'] }],
+  gasPort: [{ required: true, message: '请输入激甲端口号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -47,8 +58,14 @@
     manufacturer: '', // 厂家
     id: '',
     createTime: '',
+    cameraIp: '', // 摄像头ip
+    cameraPort: '', // 摄像头端口
+    cameraCode: '', // 摄像头编号
+    gasCode: '', // 激甲编号
+    gasIp: '', // 激甲ip
+    gasPort: '', // 激甲端口
   }
-  dataFormRef.value.clearValidate()
+  // dataFormRef.value.clearValidate()
 }
 // 获取设备类型
 const deviceTypeList = ref()
@@ -73,7 +90,6 @@
   dialogFormVisible.value = true
   btnLoading.value = false
   if (dialogStatus.value === 'create') { // 如果是新增，清除验证
-    console.log('新增')
     resetForm()
     isEditMode.value = false
     nextTick(() => {
@@ -81,7 +97,6 @@
     })
   }
   else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
-    console.log('编辑')
     deviceForm.value = {
       deviceType: row.deviceType, // 设备类型
       deviceCode: row.deviceCode, // 设备编号
@@ -90,6 +105,12 @@
       manufacturer: row.manufacturer, // 厂家
       id: row.id,
       createTime: row.createTime,
+      cameraIp: row.cameraIp, // 摄像头ip
+      cameraPort: row.cameraPort, // 摄像头端口
+      cameraCode: row.cameraCode, // 摄像头编号
+      gasCode: row.gasCode, // 激甲编号
+      gasIp: row.gasIp, // 激甲ip
+      gasPort: row.gasPort, // 激甲端口
     }
     isEditMode.value = true
   }
@@ -162,11 +183,20 @@
   dialogFormVisible.value = false
   resetForm()
 }
+// 是否安全帽
+const isANQUANMAO = computed(() => {
+  if (deviceTypeList.value.length) {
+    return deviceTypeList.value.filter((item: any) => item.value === deviceForm.value.deviceType)[0]?.name === '安全树'
+  }
+  else {
+    return false
+  }
+})
 </script>
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
-    <el-form ref="dataFormRef" :rules="rules" :model="deviceForm" label-position="right" label-width="80px">
+    <el-form ref="dataFormRef" :rules="rules" :model="deviceForm" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
@@ -203,6 +233,30 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row v-if="isANQUANMAO" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="激光甲烷IP" prop="gasIp">
+            <el-input v-model.trim="deviceForm.gasIp" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="激光甲烷端口" prop="gasPort">
+            <el-input v-model.trim="deviceForm.gasPort" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isANQUANMAO" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="摄像头IP" prop="cameraIp">
+            <el-input v-model.trim="deviceForm.cameraIp" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="摄像头端口" prop="cameraPort">
+            <el-input v-model.trim="deviceForm.cameraPort" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index fc0240c..0fcc508 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -17,12 +17,12 @@
   deviceCode: '',
   deviceType: '',
   offset: 1,
-  limit: 20,
+  limit: 5,
 })
 const columns = ref<TableColumn[]>([
   {
     text: '设备类型',
-    value: 'deviceType',
+    value: 'deviceTypeName',
     align: 'center',
     // width: 170,
   },
@@ -39,7 +39,7 @@
   },
   {
     text: '是否供电',
-    value: 'isPowerSupply',
+    value: 'isPowerSupplyName',
     align: 'center',
   },
   {
@@ -54,7 +54,7 @@
   },
   {
     text: '当前状态',
-    value: '7',
+    value: 'statusName',
     align: 'center',
   },
 ])
@@ -142,6 +142,7 @@
   <div class="list-log">
     <!-- 布局 -->
     <app-container>
+      <!-- 人员编辑 -->
       <edit-list ref="editRef" @watch-child="search" />
       <!-- 筛选条件 -->
       <search-area @search="search">
diff --git a/src/views/person/index.vue b/src/views/person/index.vue
index 75f6b22..f36b253 100644
--- a/src/views/person/index.vue
+++ b/src/views/person/index.vue
@@ -6,11 +6,19 @@
 <script lang="ts" setup name="person">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import type { dict } from './person-interface'
+import { delPerson, getPersonListPage } from '@/api/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getDictByCode } from '@/api/system/dict'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  beginTime: '',
-  endTime: '',
+  name: '',
+  startDate: '',
+  status: '',
+  deptId: '',
+  endDate: '',
   // logType: '业务日志',
   offset: 1,
   limit: 20,
@@ -18,115 +26,58 @@
 const columns = ref([
   {
     text: '姓名',
-    value: '1',
+    value: 'workerName',
     align: 'center',
     // width: 170,
   },
   {
     text: '性别',
-    value: '2',
+    value: 'genderName',
     align: 'center',
     // width: 100,
   },
   {
     text: '联系方式',
-    value: '3',
+    value: 'phoneNumber',
     align: 'center',
   },
   {
     text: '所属部门',
-    value: '4',
+    value: 'deptName',
     align: 'center',
   },
   {
     text: '注册时间',
-    value: '5',
+    value: 'createTime',
     align: 'center',
   },
   {
     text: '当前状态',
-    value: '6',
+    value: 'statusName',
     align: 'center',
   },
 ])
 const list = ref([])
 const total = ref(20)
-const logTypeList = ref(null)
 const listLoading = ref(true)
-const dialogFormVisible = ref(false)
-const dialogStatus = ref('')
-// 获取日志数据
+// 获取列表
 const fetchData = () => {
   listLoading.value = true
-  // getBizLogList(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [
-    {
-      1: '张三',
-      2: '男',
-      3: '1370000000',
-      4: '生产部',
-      5: '2020-02-02',
-      6: '作业中',
-    },
-    {
-      1: '李四',
-      2: '女',
-      3: '1572000000',
-      4: '运维部',
-      5: '2021-01-01',
-      6: '正常',
-    },
-  ]
-  total.value = list.value.length
-  listLoading.value = false
-}
-
-fetchData()
-
-// 打开详情对话框
-// const detail = (row: any) => {
-//   getBizLogDetail(row.id).then((res) => {
-//     if (res.code === 200) {
-//       ElMessageBox.alert(res.data, '详情', {
-//         confirmButtonText: '确定',
-//       })
-//     }
-//   })
-// }
-
-// 清空日志
-const cleanAll = () => {
-  ElMessageBox.confirm('确定要清空全部日志吗？', '确认操作', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    // delLog().then((response) => {
-    //   if (response.code === 200) {
-    //     ElMessage({
-    //       message: '删除成功',
-    //       type: 'success',
-    //     })
-    //     list.value = []
-    //     total.value = 0
-    //     // this.fetchData()
-    //   }
-    // })
+  getPersonListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
   })
 }
 
+fetchData()
 // 查询数据
 const search = () => {
   fetchData()
 }
 // 新增人员
 const add = (row: any) => {
-  // personRef.value.initDialog('create')
-  $router.push({ path: '/person/personedit' })
+  $router.push({ path: '/person/personedit', query: { type: 'add' } })
 }
 // 人脸注册
 const register = (row: any) => {
@@ -134,14 +85,8 @@
 }
 // 编辑人员
 const edit = (row: any) => {
-  // personRef.value.initDialog('update', {})
+  $router.push({ path: '/person/personedit', query: { type: 'update', row: JSON.stringify(row) } })
 }
-// 获取日志类型
-// const fetchLogType = () => {
-//   getLogType().then((response) => {
-//     logTypeList.value = response.data
-//   })
-// }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
@@ -159,6 +104,50 @@
 const multiSelect = (row: any[]) => {
   selectList.value = row
 }
+// 删除
+const del = () => {
+  if (selectList.value.length) {
+    ElMessageBox.confirm('是否删除所选的数据?', '提示', {
+      confirmButtonText: '是',
+      cancelButtonText: '否',
+      type: 'info',
+    }).then((res) => {
+      // 点击确认
+      const ids = selectList.value.map(item => item.id)
+      delPerson(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
+    }).catch(() => {
+      // 点击取消
+      selectList.value = []
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+const deptTreeList = ref([])
+// 加载组织机构树形下拉
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+// 人员状态列表
+const workerStatusList = ref<dict[]>([])
+const fetchStatusList = () => {
+  getDictByCode('workerStatus').then((response) => {
+    workerStatusList.value = response.data
+  })
+}
+fetchStatusList()
+fetchDeptTree()
 </script>
 
 <template>
@@ -169,31 +158,29 @@
       <!-- 筛选条件 -->
       <search-area @search="search">
         <search-item>
-          <el-input v-model.trim="listQuery.beginTime" placeholder="姓名" clearable />
+          <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.beginTime" clearable placeholder="所属部门">
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value"></el-option>
+          <dept-select v-model="listQuery.deptId" :data="deptTreeList" placeholder="所属部门" style="width: 100%;" />
+        </search-item>
+        <search-item>
+          <el-select v-model="listQuery.status" clearable placeholder="当前状态">
+            <el-option v-for="item in workerStatusList" :key="item.id" :label="item.name" :value="item.value"></el-option>
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.beginTime" clearable placeholder="当前状态">
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value"></el-option>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-date-picker v-model="listQuery.beginTime" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
+          <el-date-picker v-model="listQuery.startDate" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="注册开始时间" />
         </search-item>
         <search-item>
-          <el-date-picker v-model="listQuery.endTime" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
+          <el-date-picker v-model="listQuery.endDate" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="注册结束时间" />
         </search-item>
         <template #btns>
           <el-button class="search-btn" type="primary" @click="add">
             新增
           </el-button>
-          <el-button class="search-btn" type="info" >
+          <el-button class="search-btn" type="info" @click="del">
             删除
           </el-button>
         </template>
@@ -205,7 +192,7 @@
           <template #columns>
             <el-table-column label="人脸注册" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="register(scope.row)">
+                <el-button link type="primary" :disabled="scope.row.workerAvatar" size="small" @click="register(scope.row)">
                   注册
                 </el-button>
               </template>
diff --git a/src/views/person/person-interface.ts b/src/views/person/person-interface.ts
new file mode 100644
index 0000000..b7c9cf7
--- /dev/null
+++ b/src/views/person/person-interface.ts
@@ -0,0 +1,6 @@
+// 字典值类型
+export interface dict {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/person/personEdit.vue b/src/views/person/personEdit.vue
index dcff2a0..318c9ad 100644
--- a/src/views/person/personEdit.vue
+++ b/src/views/person/personEdit.vue
@@ -6,18 +6,28 @@
 <script lang="ts" setup name="personEdit">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
-import photograph from './photograph.vue'
 import { Plus } from '@element-plus/icons-vue'
+import photograph from './photograph.vue'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getDictByCode } from '@/api/system/dict'
+import { addPerson, updatePerson, uploadApi } from '@/api/person'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm: { [key: string]: string | any } = ref({
-  account: '',
-  name: '', // 姓名
+  workerName: '', // 姓名
+  gender: '',
+  deptId: '', // 所属部门
+  phoneNumber: '', // 联系方式
+  workerAvatar: '', // 照片
+  idCardNumber: '', // 身份证号
+  workerType: '1',
 }) // 表单
-const multipleTableRef = ref<InstanceType<typeof ElTable>>()
-const title = ref('')
-const staffId = ref('')
+// 图片地址
+const photoUrl = computed(() => {
+  return `${import.meta.env.VITE_APP_API_BASEURL}/static/${ruleForm.value.workerAvatar}`
+})
 const photographRef = ref()
 // 身份证号码验证规则
 const validateIDcard = (rule: any, value: any, callback: any) => {
@@ -30,27 +40,37 @@
   }
 }
 const rules = ref({
-  name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+  workerName: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+  gender: [{ required: true, message: '性别不能为空', trigger: 'blur' }],
+  deptId: [{ required: true, message: '所属部门不能为空', trigger: 'blur' }],
+  phoneNumber: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  idCardNumber: [{ required: true, message: '身份证号码不符合规范', trigger: 'blur', validator: validateIDcard }],
 }) // 表单验证规则
-// 根据身份证得到生日
-const getBirthday = () => {
-  ruleFormRef.value?.validateField('idCard').then((res) => {
-    // 获取生日
-    const IdCard = ruleForm.value.idCard
-    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
-    ruleForm.value.birthday = birthday
-    // 获取性别 第17位  奇数为男 偶数为女
-    // ruleForm.value.sex
-    if (Number(IdCard.substring(16, 17)) % 2) {
-      // 男
-      ruleForm.value.sex = '1'
-    }
-    else {
-      //  女
-      ruleForm.value.sex = '2'
+
+// 图片上传请求
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('file', file.file)
+  uploadApi(fd).then((res) => {
+    if (res.code === 200) {
+      console.log(res.data, '123')
+      ElMessage.success('上传成功')
+      ruleForm.value.workerAvatar = res.data
     }
   })
 }
+// 图片上传之前的验证
+const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png' && rawFile.type !== 'image/jpg') {
+    ElMessage.error('只能上传png/jpeg/jpg格式的图片')
+    return false
+  }
+  else if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('图片不能大于2MB')
+    return false
+  }
+  return true
+}
 // 拍照功能
 const tackPhoto = ref(false)
 const register = () => {
@@ -59,31 +79,10 @@
 }
 // 关闭摄像头
 const offPthot = (url: string) => {
-  console.log(url, '图片地址')
-  tackPhoto.value = false
-}
-// const PubList = ref<TreeStructure[]>([])
-// const PubListTree = ref([])
-// 获取组织列表
-// const getPubList = () => {
-//   getDeptTreeList().then((res) => {
-//     // 转成树结构
-//     PubList.value = res.data
-//     PubListTree.value = toTreeList(res.data, '0', true)
-//   })
-// }
-// const sexList = ref<{ id: string; value: string; name: string }[]>()
-// // 获取性别
-// const getSexList = () => {
-//   getDictByCode('sex').then((response) => {
-//     sexList.value = response.data
-//   })
-// }
-// 重置表单内容
-const resetFormData = () => {
-  ruleForm.value = {
-    name: '', // 姓名
+  if (url) {
+    ruleForm.value.workerAvatar = url
   }
+  tackPhoto.value = false
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
@@ -100,50 +99,81 @@
           type: 'warning',
         },
       ).then(() => {
+        // 更新或者新增
+        ($route.query.type === 'add' ? addPerson(ruleForm.value) : updatePerson(ruleForm.value)).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('操作成功')
+            $router.go(-1)
+          }
+        })
       })
     }
   })
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
+const resetForm = () => {
   $router.go(-1)
 }
+const deptTreeList = ref([])
+// 加载组织机构树形下拉
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+fetchDeptTree()
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sysSex').then((response) => {
+    sexList.value = response.data
+  })
+}
+getSexList()
+const title = ref('')
+onMounted(() => {
+  const type = $route.query.type
+  if (type === 'update') {
+    title.value = '人员编辑'
+    const row = JSON.parse($route.query.row as string)
+    ruleForm.value = row
+  }
+  else {
+    title.value = '人员新增'
+  }
+})
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container>
     <!-- 拍照组件 -->
-    <photograph ref="photographRef" :tack-photo="tackPhoto" @off="offPthot"/>
-    <detail-page :title="`人员新增`">
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+    <photograph ref="photographRef" :tack-photo="tackPhoto" @off="offPthot" />
+    <detail-page :title="title">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" border
+        stripe>
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item prop="minioFileName" >
-              <el-upload
-                class="avatar-uploader"
-                :show-file-list="false"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-upload="beforeAvatarUpload"
-                :disabled="title === '详情'"
-                accept="image/png, image/jpeg,image/jpg"
-              >
-                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
+            <el-form-item>
+              <el-upload class="avatar-uploader" :show-file-list="false" :http-request="uploadQuarterlyEvaluateFile"
+                :before-upload="beforeAvatarUpload" accept="image/png, image/jpeg,image/jpg">
+                <img v-if="ruleForm.workerAvatar" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
               </el-upload>
-              <el-button type="primary" style="margin-top: 20px; display: block; width: 190px;" @click="register">人脸注册</el-button>
+              <el-button type="primary" style="margin-top: 20px; display: block; width: 190px;"
+                @click="register">人脸注册</el-button>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="姓名" prop="name" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.name" placeholder="姓名" :disabled="title === '详情'">
+            <el-form-item label="姓名" prop="workerName" style="margin-top: 40px;">
+              <el-input v-model.trim="ruleForm.workerName" placeholder="姓名">
               </el-input>
             </el-form-item>
-            <el-form-item label="所属部门" prop="sex" class="marg-item" style="margin-top: 40px;">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '所属部门'" style="width: 100%;">
-                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
+            <el-form-item label="所属部门" prop="deptId" class="marg-item" style="margin-top: 40px;">
+              <dept-select v-model="ruleForm.deptId" :data="deptTreeList" placeholder="所属部门" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="职务" prop="name" style="margin-top: 40px;">
               <el-input v-model.trim="ruleForm.name" placeholder="职务" :disabled="title === '详情'">
@@ -151,17 +181,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="性别" prop="sex" class="marg-item" style="margin-top: 40px;">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
+            <el-form-item label="性别" prop="gender" class="marg-item" style="margin-top: 40px;">
+              <el-select v-model="ruleForm.gender" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="联系方式" prop="name" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.name" placeholder="联系方式" :disabled="title === '详情'">
+            <el-form-item label="联系方式" prop="phoneNumber" style="margin-top: 40px;">
+              <el-input v-model.trim="ruleForm.phoneNumber" placeholder="联系方式" :disabled="title === '详情'">
               </el-input>
             </el-form-item>
-            <el-form-item label="证件号码" prop="name" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.name" placeholder="证件号码" :disabled="title === '详情'">
+            <el-form-item label="证件号码" prop="idCardNumber" style="margin-top: 40px;">
+              <el-input v-model.trim="ruleForm.idCardNumber" placeholder="证件号码" :disabled="title === '详情'">
               </el-input>
             </el-form-item>
           </el-col>
@@ -169,10 +199,10 @@
         </el-row>
       </el-form>
       <div class="dialog-footer">
-        <el-button @click="resetForm" style="margin-left: 30px;">
+        <el-button style="margin-left: 30px;" @click="resetForm">
           取消
         </el-button>
-        <el-button :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">
           保存
         </el-button>
       </div>
@@ -181,11 +211,12 @@
 </template>
 
 <style lang="scss" scoped>
-.dialog-footer{
+.dialog-footer {
   display: flex;
   justify-items: end;
   flex-direction: row-reverse;
 }
+
 :deep(.el-radio__label) {
   display: none;
 }
@@ -206,8 +237,9 @@
 
 .isDetail {
   ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap>.el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk)>.el-form-item__label::before {
       display: none;
     }
   }
diff --git a/src/views/person/photograph.vue b/src/views/person/photograph.vue
index 488cf4f..02d4551 100644
--- a/src/views/person/photograph.vue
+++ b/src/views/person/photograph.vue
@@ -5,7 +5,7 @@
  -->
 <script lang="ts" setup name="photograph">
 import { ElMessage } from 'element-plus'
-// import { putFileAttach } from "@/api/customer/animalinfo"
+import { uploadApi } from '@/api/person'
 // 父组件传来的拍照状态 true 拍照 false 关闭拍照
 const props = defineProps({
   tackPhoto: {
@@ -23,6 +23,7 @@
 const blobFile = ref<File>()
 const mediaStreamTrack = ref('')
 const canvasRef = ref()
+const dialogFormVisible = ref(false)
 // 监听接收到拍摄状态后，开始调取摄像头权限
 watch(() => props.tackPhoto, (newVal) => {
   if (newVal) {
@@ -92,11 +93,25 @@
   // 转为本地路径
   const dataurl = canvas.toDataURL('image/jpeg')
   // 用时间戳作为文件名
-  const filenname = Date.now().toString()
+  const filenname = `${Date.now().toString()}.png`
   // 将blob文件转为文件对象
   blobFile.value = dataURLtoFile(dataurl, filenname)
   preViewVisible.value = true
 }
+//  关闭弹窗
+const close = () => {
+  const canvas = document.querySelector('#canvas-photo')
+  // 获取图片base64链接
+  // var image = canvas.toDataURL('image/png')
+  canvas.getContext('2d').clearRect(0, 0, 400, 300)// 清除画布
+  // 关闭摄像头
+  mediaStreamTrack.value.getVideoTracks().forEach((track) => {
+    track.stop()
+  })
+  blobFile.value = null
+  // 告诉父组件关闭摄像头
+  emits('off', '')
+}
 // 保存图片
 const takePhoneUpfile = () => {
   console.log(blobFile.value)
@@ -108,43 +123,28 @@
   const formData = new FormData()
   formData.append('file', blobFile.value)// 图片内容
   // 上传图片
-  // putFileAttach(formData).then(res => {// 后台接口
-  //   loadingbut.value = false
-  //   // this.$emit('picture', res.data.data); // 返回给父组件展示
-  //   props.tackPhoto = false
-  //   canvas.value.getContext('2d').clearRect(0, 0, 400, 300)// 清除画布
-  //   // 关闭摄像头
-  //   mediaStreamTrack.value.getVideoTracks().forEach(function (track) {
-  //     track.stop()
-  //   })
-  // 获取图片base64链接
-  // const canvas = document.querySelector('#canvas-photo')
-  // var image = canvas.toDataURL('image/png')
-  // // 告诉父组件关闭摄像头
-  // emits('off',image)
-  // }, (error) => {
-  //   loadingbut.value = false
-  //   window.console.log(error)
-  // })
+  uploadApi(formData).then((res) => { // 后台接口
+    loadingbut.value = false
+    blobFile.value = null
+    const canvas = document.querySelector('#canvas-photo')
+    // 获取图片base64链接
+    canvas.getContext('2d').clearRect(0, 0, 400, 300)// 清除画布
+    // 关闭摄像头
+    mediaStreamTrack.value.getVideoTracks().forEach((track) => {
+      track.stop()
+    })
+    // 告诉父组件关闭摄像头,并且把返回结果传出去
+    emits('off', res.data)
+    dialogFormVisible.value = false
+  }, (error) => {
+    loadingbut.value = false
+    window.console.log(error)
+  })
 }
-const dialogFormVisible = ref(false)
 const initDialog = () => {
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
-//  关闭弹窗
-const close = () => {
-  const canvas = document.querySelector('#canvas-photo')
-   // 获取图片base64链接
-   var image = canvas.toDataURL('image/png')
-  canvas.getContext('2d').clearRect(0, 0, 400, 300)// 清除画布
-  // 关闭摄像头
-  mediaStreamTrack.value.getVideoTracks().forEach((track) => {
-    track.stop()
-  })
-  // 告诉父组件关闭摄像头
-  emits('off', image)
-}
 </script>
 
 <template>
@@ -156,9 +156,7 @@
           <!-- 这里就是摄像头显示的画面 -->
           <video id="video-photo" width="400" height="300"></video>
           <div class="iCenter">
-            <el-button
-              type="primary" style="margin-top: 10px;"
-                       @click="takePhone">拍照</el-button>
+            <el-button type="primary" style="margin-top: 10px;" @click="takePhone">拍照</el-button>
           </div>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/scene/components/deviceListDialog.vue b/src/views/scene/components/deviceListDialog.vue
new file mode 100644
index 0000000..2733e3a
--- /dev/null
+++ b/src/views/scene/components/deviceListDialog.vue
@@ -0,0 +1,194 @@
+<!--
+  Description: 选择人员穿戴设备弹窗
+  Author: 李亚光
+  Date: 2023-04-28
+ -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getDeviceListPage } from '@/api/device'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { DictDetail } from '@/views/system/dict/dict-interface'
+const props = defineProps({
+  //  多选
+  multiple: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  deviceCode: '',
+  deviceType: '',
+  deviceStatus: '0',
+  offset: 1,
+  limit: 5,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref(0)
+const select = ref(-1)
+const deviceType = ref('') // 设备类型
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'deviceCode' },
+  {
+    text: '厂家',
+    value: 'manufacturer',
+  },
+  { text: '是否供电', value: 'isPowerSupplyName' },
+  { text: '批次', value: 'deviceBatch' },
+  { text: '注册时间', value: 'createTime' },
+])
+// 获取设备数据列表
+const fetchData = () => {
+  select.value = -1
+  getDeviceListPage(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.rows.length
+    }
+  })
+}
+// 获取设备类型
+const deviceTypeList = ref<DictDetail[]>([])
+const fetchDeviceType = () => {
+  getDictByCode('deviceType').then((response) => {
+    deviceTypeList.value = response.data
+  })
+}
+fetchDeviceType()
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 重置
+const reset = () => {
+  listQuery.value.deviceCode = ''
+  listQuery.value.offset = 1
+  listQuery.value.limit = 5
+  search()
+  selectList.value = []
+  select.value = -1
+}
+
+// 点击保存
+const submitForm = () => {
+  if (props.multiple) {
+    // 多选
+    if (selectList.value.length > 0) {
+      emits('add', selectList.value)
+      dialogFormVisible.value = false
+      reset()
+    }
+    else {
+      ElMessage.warning('请先选择设备')
+    }
+  }
+  else {
+    // 单选
+    if (select.value >= 0) {
+      const person = list.value.filter((item, index) => index == select.value)[0]
+      emits('add', Object.assign(person, { Type: deviceType.value }))
+      dialogFormVisible.value = false
+      reset()
+    }
+    else {
+      ElMessage.warning('请先选择设备')
+    }
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = (type: string) => {
+  deviceType.value = type
+  let typeName = ''
+  dialogFormVisible.value = true
+  if (type === 'hatCode') {
+    typeName = '安全帽'
+    // 安全帽
+  }
+  else if (type === 'vastCode') {
+    // 安全背心
+    typeName = '背心'
+  }
+  else if (type === 'braceletCode') {
+    // 安全手环
+    typeName = '手环'
+  }
+  else if (type === 'SafetyTree') {
+    // 安全手环
+    typeName = '安全树'
+  }
+  const devicetype = deviceTypeList.value.filter(item => item.name === typeName)[0].value
+  listQuery.value.deviceType = devicetype
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.deviceCode" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+        :list-loading="loadingTable" @change="changePage" :is-showmulti-select="props.multiple" :is-multi="props.multiple"
+        @multi-select="multiSelect">
+        <template #preColumns>
+          <el-table-column v-if="!props.multiple" label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/scene/components/personListDialog.vue b/src/views/scene/components/personListDialog.vue
new file mode 100644
index 0000000..c01e138
--- /dev/null
+++ b/src/views/scene/components/personListDialog.vue
@@ -0,0 +1,157 @@
+<!--
+  Description: 选择作业人员弹窗
+  Author: 李亚光
+  Date: 2023-04-28
+ -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getPersonListPage } from '@/api/person'
+import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  name: '',
+  // startDate: '',
+  status: '0',
+  deptId: '',
+  // endDate: '',
+  // logType: '业务日志',
+  offset: 1,
+  limit: 5,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref(0)
+const select = ref(-1)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '姓名', value: 'workerName' },
+  {
+    text: '性别',
+    value: 'genderName',
+  },
+  { text: '所在部门', value: 'deptName' },
+  { text: '联系方式', value: 'phoneNumber' },
+])
+// 获取人员数据列表
+const fetchData = () => {
+  select.value = -1
+  getPersonListPage(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.rows.length
+    }
+  })
+}
+fetchData()
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    name: '',
+    // startDate: '',
+    status: '0',
+    deptId: '',
+    // endDate: '',
+    // logType: '业务日志',
+    offset: 1,
+    limit: 5,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+const deptTreeList = ref([])
+// 加载组织机构树形下拉
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+fetchDeptTree()
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :data="deptTreeList" placeholder="所属部门" style="width: 100%;" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+        :list-loading="loadingTable" @change="changePage">
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/scene/components/personTable.vue b/src/views/scene/components/personTable.vue
index 0095120..35e82c3 100644
--- a/src/views/scene/components/personTable.vue
+++ b/src/views/scene/components/personTable.vue
@@ -4,41 +4,153 @@
   Date: 2023-04-24
  -->
 <script lang="ts" setup name="addOperatives">
+import { ElMessage } from 'element-plus'
+import userList from './personListDialog.vue'
+import deviceList from './deviceListDialog.vue'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+
+const userListData = ref<any[]>([])
 // 表格被选中的行
 const selectList = ref<any[]>([])
 // 表格多选
 const multiSelect = (row: any[]) => {
   selectList.value = row
 }
+const deptTreeList = ref([])
+const deptList = ref([])
+// 加载组织机构树形下拉
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptList.value = res.data
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+fetchDeptTree()
+const selectPersonRef = ref()
+const selectDeviceRef = ref()
+// 当前正在操作的人员
+const personIndex = ref(0)
+// 选择作业人员
+const selectPerson = (index: any) => {
+  personIndex.value = index
+  selectPersonRef.value.initDialog()
+}
+// 选择设备
+const selectDevice = (index: number, type: string) => {
+  personIndex.value = index
+  selectDeviceRef.value.initDialog(type)
+}
+// 选中的作业人员
+const confirmPerson = (row: any) => {
+  const person = userListData.value[personIndex.value]
+  person.workerName = row.workerName
+  person.phoneNumber = row.phoneNumber
+  person.deptId = row.deptId
+}
+// 选中的设备
+const confirmDevice = (row: any) => {
+  const person = userListData.value[personIndex.value]
+  const type = row.Type
+  person[type] = row.deviceCode
+}
+// 新增人员
+const add = () => {
+  userListData.value.push({
+    edit: true,
+    workerName: '',
+    phoneNumber: '',
+    deptId: '',
+    braceletCode: '', // 手环编号
+    hatCode: '', // 安全帽编号
+    vastCode: '', // 背心编号
+    id: '', // 人员id
+  })
+}
+// 删除人员
+const del = () => {
+
+}
+// 编辑人员
+const edit = (index: number) => {
+  userListData.value[index].edit = true
+}
+// 完成编辑
+const complete = (index: number) => {
+  if (!userListData.value[index].workerName) {
+    ElMessage.warning('请先填写完整信息')
+    return false
+  }
+  userListData.value[index].edit = false
+}
 </script>
 
 <template>
   <table-container title="新增作业人员">
+    <!-- 选择作业人员弹窗 -->
+    <user-list ref="selectPersonRef" @add="confirmPerson" />
+    <!-- 选择设备弹窗 -->
+    <device-list ref="selectDeviceRef" @add="confirmDevice" />
     <template #btns-right>
-      <el-button type="primary">新增</el-button>
-      <el-button type="info">删除</el-button>
+      <el-button type="primary" @click="add">新增</el-button>
+      <el-button type="info" @click="del">删除</el-button>
     </template>
     <!-- 查询结果Table显示 -->
-    <normal-table :data="[{}]" :columns="[]" :pagination="false" :is-showmulti-select="true" :is-multi="true"
+    <normal-table :data="userListData" :pagination="false" :is-showmulti-select="true" :is-multi="true"
       @multi-select="multiSelect">
       <template #columns>
         <el-table-column label="姓名" align="center">
+          <template #default="scope">
+            <el-input v-if="scope.row.edit" v-model.trim="scope.row.workerName" placeholder="姓名"
+              @focus="selectPerson(scope.$index)" />
+            <div v-else style="height:32px;line-height: 32px;">{{ scope.row.workerName }}</div>
+          </template>
         </el-table-column>
         <el-table-column label="联系方式" align="center">
+          <template #default="scope">
+            <el-input v-if="scope.row.edit" v-model.trim="scope.row.phoneNumber" placeholder="联系方式" />
+            <div v-else style="height:32px;line-height: 32px;">{{ scope.row.phoneNumber }}</div>
+          </template>
         </el-table-column>
         <el-table-column label="所属部门" align="center">
+          <template #default="scope">
+            <dept-select v-if="scope.row.edit" v-model="scope.row.deptId" :data="deptTreeList" placeholder="所属部门"
+              style="width: 100%;" />
+            <div v-else style="height:32px;line-height: 32px;"> {{ deptList.filter((item: any) => item.id
+              === scope.row.deptId)[0]?.name }} </div>
+          </template>
         </el-table-column>
         <el-table-column label="挂载安全帽编号" align="center">
+          <template #default="scope">
+            <el-input v-if="scope.row.edit" v-model.trim="scope.row.hatCode" placeholder="安全帽编号"
+              @focus="selectDevice(scope.$index, 'hatCode')" />
+            <div v-else style="height:32px;line-height: 32px;">{{ scope.row.hatCode }}</div>
+          </template>
         </el-table-column>
         <el-table-column label="挂载背心编号" align="center">
+          <template #default="scope">
+            <el-input v-if="scope.row.edit" v-model.trim="scope.row.vastCode" placeholder="背心编号"
+              @focus="selectDevice(scope.$index, 'vastCode')" />
+              <div v-else style="height:32px;line-height: 32px;">{{ scope.row.vastCode }}</div>
+          </template>
         </el-table-column>
         <el-table-column label="挂载手环编号" align="center">
+          <template #default="scope">
+            <el-input v-if="scope.row.edit" v-model.trim="scope.row.braceletCode" placeholder="手环编号"
+              @focus="selectDevice(scope.$index, 'braceletCode')" />
+              <div v-else style="height:32px;line-height: 32px;">{{ scope.row.braceletCode }}</div>
+          </template>
         </el-table-column>
         <el-table-column label="操作" align="center">
           <template #default="scope">
-            <el-button link type="primary" size="small" @click="detail(scope.row)">
+            <el-button v-if="!scope.row.edit" link type="primary" size="small" @click="edit(scope.$index)">
               编辑
             </el-button>
+            <el-button v-else link type="primary" size="small" @click="complete(scope.$index)">
+              完成
+            </el-button>
           </template>
         </el-table-column>
       </template>
@@ -59,5 +171,4 @@
     margin-bottom: 0 !important;
   }
 
-}
-</style>
+}</style>
diff --git a/src/views/scene/sceneEdit.vue b/src/views/scene/sceneEdit.vue
index a6b84b3..5b797ff 100644
--- a/src/views/scene/sceneEdit.vue
+++ b/src/views/scene/sceneEdit.vue
@@ -4,72 +4,55 @@
   Date: 2023-04-24
  -->
 <script lang="ts" setup name="sceneEdit">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import addOperatives from './components/personTable.vue'
+import personList from './components/personListDialog.vue'
+import deviceList from './components/deviceListDialog.vue'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm: { [key: string]: string | any } = ref({
-  account: '',
-  name: '', // 姓名
+  workTitle: '', // 作业名称
+  workRoad: '', // 所属道路
+  workSiteDesc: '', // 作业描述
+  workPerson: '', // 责任人
+  workPersonName: '',
+  workPersonPhoneNumber: '', // 负责人联系方式
+  deviceList: [], // 	安全树列表
+  workerList: '', // 人员列表
 }) // 表单
 const title = ref('')
-// 身份证号码验证规则
-const validateIDcard = (rule: any, value: any, callback: any) => {
-  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
-  if (rr.test(value)) {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
 const rules = ref({
-  name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+  workTitle: [{ required: true, message: '作业名称不能为空', trigger: 'blur' }],
+  workRoad: [{ required: true, message: '所属道路不能为空', trigger: 'blur' }],
+  workSiteDesc: [{ required: true, message: '作业描述不能为空', trigger: 'blur' }],
+  workPersonName: [{ required: true, message: '责任人不能为空', trigger: 'blur' }],
+  deviceList: [{ required: true, message: '安全树列表不能为空', trigger: 'blur' }],
+  workerList: [{ required: true, message: '人员列表不能为空', trigger: 'blur' }],
 }) // 表单验证规则
-// 根据身份证得到生日
-const getBirthday = () => {
-  ruleFormRef.value?.validateField('idCard').then((res) => {
-    // 获取生日
-    const IdCard = ruleForm.value.idCard
-    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
-    ruleForm.value.birthday = birthday
-    // 获取性别 第17位  奇数为男 偶数为女
-    // ruleForm.value.sex
-    if (Number(IdCard.substring(16, 17)) % 2) {
-      // 男
-      ruleForm.value.sex = '1'
-    }
-    else {
-      //  女
-      ruleForm.value.sex = '2'
-    }
-  })
+// 人员列表弹窗组件
+const selectPersonRef = ref()
+// 选择负责人
+const seletPerson = () => {
+  selectPersonRef.value.initDialog()
 }
-
-// const PubList = ref<TreeStructure[]>([])
-// const PubListTree = ref([])
-// 获取组织列表
-// const getPubList = () => {
-//   getDeptTreeList().then((res) => {
-//     // 转成树结构
-//     PubList.value = res.data
-//     PubListTree.value = toTreeList(res.data, '0', true)
-//   })
-// }
-// const sexList = ref<{ id: string; value: string; name: string }[]>()
-// // 获取性别
-// const getSexList = () => {
-//   getDictByCode('sex').then((response) => {
-//     sexList.value = response.data
-//   })
-// }
-// 重置表单内容
-const resetFormData = () => {
-  ruleForm.value = {
-    name: '', // 姓名
-  }
+// 确定负责人
+const selectWorker = (row: any) => {
+  ruleForm.value.workPerson = row.id
+  ruleForm.value.workPersonName = row.workerName
+  ruleFormRef.value.clearValidate('workPersonName')
+}
+const selectDeviceRef = ref()
+// 选择安全树设备
+const seletDevice = () => {
+  selectDeviceRef.value.initDialog('SafetyTree')
+}
+// 确定安全树设备
+const confirmDevice = (list: any) => {
+  list.forEach((device: any) => {
+    ruleForm.value.deviceList.push(device.deviceCode)
+  })
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
@@ -91,54 +74,63 @@
   })
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
+const resetForm = () => {
   $router.go(-1)
 }
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
-    <detail-page :title="`人员新增`">
+    <!-- 选择负责人弹窗 -->
+    <person-list ref="selectPersonRef" @add="selectWorker" />
+    <!-- 选择安全树设备弹窗 -->
+    <device-list ref="selectDeviceRef" @add="confirmDevice" :multiple="true" />
+    <detail-page title="作业现场新增">
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px"
         :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24">
           <el-col :span="2"></el-col>
           <el-col :span="8">
-            <el-form-item label="作业名称" prop="name" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.name" placeholder="作业名称" :disabled="title === '详情'">
+            <el-form-item label="作业名称" prop="workTitle" style="margin-top: 40px;">
+              <el-input v-model.trim="ruleForm.workTitle" placeholder="作业名称" :disabled="title === '详情'">
               </el-input>
             </el-form-item>
-            <el-form-item label="安全树" prop="sex" class="marg-item" style="margin-top: 40px;">
-              <el-select v-model="ruleForm.sex" placeholder="安全树" :disabled="title === '安全树'" style="width: 100%;">
-                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
+            <el-form-item label="安全树" prop="deviceList" class="marg-item" style="margin-top: 40px;">
+              <el-select v-model.trim="ruleForm.deviceList" placeholder="安全树" :disabled="title === '详情'"
+                @focus="seletDevice" style="width:100%" multiple></el-select>
             </el-form-item>
-            <el-form-item label="责任人" prop="name" style="margin-top: 40px;">
-              <el-select v-model="ruleForm.sex" placeholder="责任人" :disabled="title === '责任人'" style="width: 100%;">
-                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
+            <el-form-item label="责任人" prop="workPersonName" style="margin-top: 40px;">
+              <el-select v-model.trim="ruleForm.workPersonName" placeholder="责任人" :disabled="title === '详情'"
+                @focus="seletPerson" style="width:100%"></el-select>
             </el-form-item>
           </el-col>
           <el-col :span="2"></el-col>
           <el-col :span="8">
-            <el-form-item label="所属道路" prop="name" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.name" placeholder="所属道路" :disabled="title === '详情'">
+            <el-form-item label="所属道路" prop="workRoad" style="margin-top: 40px;">
+              <el-input v-model.trim="ruleForm.workRoad" placeholder="所属道路" :disabled="title === '详情'">
               </el-input>
             </el-form-item>
-            <el-form-item label="作业概述" prop="name" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.name" type="textarea" :rows="4" placeholder="作业概述" :disabled="title === '详情'">
+            <el-form-item label="作业概述" prop="workSiteDesc" style="margin-top: 40px;">
+              <el-input v-model.trim="ruleForm.workSiteDesc" type="textarea" :rows="4" placeholder="作业概述"
+                :disabled="title === '详情'">
               </el-input>
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="" label-width="0px">
+              <!-- 添加工作人员 -->
+              <add-operatives style="width:100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
-      <!-- 添加工作人员 -->
-      <add-operatives />
       <div class="dialog-footer">
         <el-button @click="resetForm" style="margin-left: 30px;">
           取消
         </el-button>
-        <el-button :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">
           保存
         </el-button>
       </div>