diff --git a/src/api/scene.ts b/src/api/scene.ts
new file mode 100644
index 0000000..0956614
--- /dev/null
+++ b/src/api/scene.ts
@@ -0,0 +1,45 @@
+/**
+ * 现场管理接口
+ */
+import request from './index'
+const prefix = 'site'
+
+// 现场列表
+export function getSceneListPage(params: object) {
+  return request({
+    url: `${prefix}/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 更新现场
+export function updateScene(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新增现场
+export function addScene(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除现场
+export function delScene(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 现场详情
+export function getSceneDetail(id: string) {
+  return request({
+    url: `${prefix}/detail?projectId=${id}`,
+    method: 'get',
+  })
+}

diff --git a/src/api/scene.ts b/src/api/scene.ts
new file mode 100644
index 0000000..0956614
--- /dev/null
+++ b/src/api/scene.ts
@@ -0,0 +1,45 @@
+/**
+ * 现场管理接口
+ */
+import request from './index'
+const prefix = 'site'
+
+// 现场列表
+export function getSceneListPage(params: object) {
+  return request({
+    url: `${prefix}/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 更新现场
+export function updateScene(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新增现场
+export function addScene(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除现场
+export function delScene(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 现场详情
+export function getSceneDetail(id: string) {
+  return request({
+    url: `${prefix}/detail?projectId=${id}`,
+    method: 'get',
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..ebaac07 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -156,13 +156,18 @@
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
+// 清除单选选中
+const clearRadio = () => {
+  console.log('清理单选选中')
+  singleChecked.value = ''
+}
 // 清除多选选中
 const clearMulti = () => {
-  console.log('清理选中')
+  console.log('清理选多选中')
   table.value!.clearSelection()
 }
 defineExpose({
-  clearMulti, initColumnsState,
+  clearMulti, initColumnsState, clearRadio,
 })
 onBeforeMount(() => {
   initColumnsState()

diff --git a/src/api/scene.ts b/src/api/scene.ts
new file mode 100644
index 0000000..0956614
--- /dev/null
+++ b/src/api/scene.ts
@@ -0,0 +1,45 @@
+/**
+ * 现场管理接口
+ */
+import request from './index'
+const prefix = 'site'
+
+// 现场列表
+export function getSceneListPage(params: object) {
+  return request({
+    url: `${prefix}/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 更新现场
+export function updateScene(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新增现场
+export function addScene(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除现场
+export function delScene(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 现场详情
+export function getSceneDetail(id: string) {
+  return request({
+    url: `${prefix}/detail?projectId=${id}`,
+    method: 'get',
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..ebaac07 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -156,13 +156,18 @@
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
+// 清除单选选中
+const clearRadio = () => {
+  console.log('清理单选选中')
+  singleChecked.value = ''
+}
 // 清除多选选中
 const clearMulti = () => {
-  console.log('清理选中')
+  console.log('清理选多选中')
   table.value!.clearSelection()
 }
 defineExpose({
-  clearMulti, initColumnsState,
+  clearMulti, initColumnsState, clearRadio,
 })
 onBeforeMount(() => {
   initColumnsState()
diff --git a/src/router/modules/scene.ts b/src/router/modules/scene.ts
index 5e24ee8..9f8388b 100644
--- a/src/router/modules/scene.ts
+++ b/src/router/modules/scene.ts
@@ -38,6 +38,30 @@
           activeMenu: '/scene',
         },
       },
+      {
+        path: 'scenedetail',
+        name: 'scenedetail',
+        component: () => import('@/views/scene/sceneDetail.vue'),
+        meta: {
+          title: '现场详情',
+          auth: '/scene',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/scene',
+        },
+      },
+      {
+        path: 'scenereport',
+        name: 'scenereport',
+        component: () => import('@/views/scene/sceneReport.vue'),
+        meta: {
+          title: '现场报告',
+          auth: '/scene',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/scene',
+        },
+      },
     ],
   },
 ]

diff --git a/src/api/scene.ts b/src/api/scene.ts
new file mode 100644
index 0000000..0956614
--- /dev/null
+++ b/src/api/scene.ts
@@ -0,0 +1,45 @@
+/**
+ * 现场管理接口
+ */
+import request from './index'
+const prefix = 'site'
+
+// 现场列表
+export function getSceneListPage(params: object) {
+  return request({
+    url: `${prefix}/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 更新现场
+export function updateScene(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新增现场
+export function addScene(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除现场
+export function delScene(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 现场详情
+export function getSceneDetail(id: string) {
+  return request({
+    url: `${prefix}/detail?projectId=${id}`,
+    method: 'get',
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..ebaac07 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -156,13 +156,18 @@
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
+// 清除单选选中
+const clearRadio = () => {
+  console.log('清理单选选中')
+  singleChecked.value = ''
+}
 // 清除多选选中
 const clearMulti = () => {
-  console.log('清理选中')
+  console.log('清理选多选中')
   table.value!.clearSelection()
 }
 defineExpose({
-  clearMulti, initColumnsState,
+  clearMulti, initColumnsState, clearRadio,
 })
 onBeforeMount(() => {
   initColumnsState()
diff --git a/src/router/modules/scene.ts b/src/router/modules/scene.ts
index 5e24ee8..9f8388b 100644
--- a/src/router/modules/scene.ts
+++ b/src/router/modules/scene.ts
@@ -38,6 +38,30 @@
           activeMenu: '/scene',
         },
       },
+      {
+        path: 'scenedetail',
+        name: 'scenedetail',
+        component: () => import('@/views/scene/sceneDetail.vue'),
+        meta: {
+          title: '现场详情',
+          auth: '/scene',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/scene',
+        },
+      },
+      {
+        path: 'scenereport',
+        name: 'scenereport',
+        component: () => import('@/views/scene/sceneReport.vue'),
+        meta: {
+          title: '现场报告',
+          auth: '/scene',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/scene',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/device/deviceEdit.vue b/src/views/device/deviceEdit.vue
index 63d1474..2f6e4af 100644
--- a/src/views/device/deviceEdit.vue
+++ b/src/views/device/deviceEdit.vue
@@ -126,20 +126,27 @@
       btnLoading.value = true
       addDevice(deviceForm.value).then((response) => {
         if (response.code === 200) {
-          ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
-            confirmButtonText: '是',
-            cancelButtonText: '否',
-            type: 'info',
-          }).then(() => { // 选是
-            resetForm()
-            btnLoading.value = false
-            nextTick(() => {
-              dataFormRef.value.clearValidate()
-            })
-          }).catch(() => { // 选否,关闭窗口，并刷新页面
-            emits('watchChild')
-            dialogFormVisible.value = false
+          ElMessage({
+            message: '新增成功',
+            type: 'success',
           })
+          dataFormRef.value.clearValidate()
+          emits('watchChild')
+          dialogFormVisible.value = false
+          // ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
+          //   confirmButtonText: '是',
+          //   cancelButtonText: '否',
+          //   type: 'info',
+          // }).then(() => { // 选是
+          //   resetForm()
+          //   btnLoading.value = false
+          //   nextTick(() => {
+          //     dataFormRef.value.clearValidate()
+          //   })
+          // }).catch(() => { // 选否,关闭窗口，并刷新页面
+          //   emits('watchChild')
+          //   dialogFormVisible.value = false
+          // })
         }
       }).catch((_) => { // 异常情况，loading置为false
         btnLoading.value = false

diff --git a/src/api/scene.ts b/src/api/scene.ts
new file mode 100644
index 0000000..0956614
--- /dev/null
+++ b/src/api/scene.ts
@@ -0,0 +1,45 @@
+/**
+ * 现场管理接口
+ */
+import request from './index'
+const prefix = 'site'
+
+// 现场列表
+export function getSceneListPage(params: object) {
+  return request({
+    url: `${prefix}/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 更新现场
+export function updateScene(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新增现场
+export function addScene(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除现场
+export function delScene(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 现场详情
+export function getSceneDetail(id: string) {
+  return request({
+    url: `${prefix}/detail?projectId=${id}`,
+    method: 'get',
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..ebaac07 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -156,13 +156,18 @@
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
+// 清除单选选中
+const clearRadio = () => {
+  console.log('清理单选选中')
+  singleChecked.value = ''
+}
 // 清除多选选中
 const clearMulti = () => {
-  console.log('清理选中')
+  console.log('清理选多选中')
   table.value!.clearSelection()
 }
 defineExpose({
-  clearMulti, initColumnsState,
+  clearMulti, initColumnsState, clearRadio,
 })
 onBeforeMount(() => {
   initColumnsState()
diff --git a/src/router/modules/scene.ts b/src/router/modules/scene.ts
index 5e24ee8..9f8388b 100644
--- a/src/router/modules/scene.ts
+++ b/src/router/modules/scene.ts
@@ -38,6 +38,30 @@
           activeMenu: '/scene',
         },
       },
+      {
+        path: 'scenedetail',
+        name: 'scenedetail',
+        component: () => import('@/views/scene/sceneDetail.vue'),
+        meta: {
+          title: '现场详情',
+          auth: '/scene',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/scene',
+        },
+      },
+      {
+        path: 'scenereport',
+        name: 'scenereport',
+        component: () => import('@/views/scene/sceneReport.vue'),
+        meta: {
+          title: '现场报告',
+          auth: '/scene',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/scene',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/device/deviceEdit.vue b/src/views/device/deviceEdit.vue
index 63d1474..2f6e4af 100644
--- a/src/views/device/deviceEdit.vue
+++ b/src/views/device/deviceEdit.vue
@@ -126,20 +126,27 @@
       btnLoading.value = true
       addDevice(deviceForm.value).then((response) => {
         if (response.code === 200) {
-          ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
-            confirmButtonText: '是',
-            cancelButtonText: '否',
-            type: 'info',
-          }).then(() => { // 选是
-            resetForm()
-            btnLoading.value = false
-            nextTick(() => {
-              dataFormRef.value.clearValidate()
-            })
-          }).catch(() => { // 选否,关闭窗口，并刷新页面
-            emits('watchChild')
-            dialogFormVisible.value = false
+          ElMessage({
+            message: '新增成功',
+            type: 'success',
           })
+          dataFormRef.value.clearValidate()
+          emits('watchChild')
+          dialogFormVisible.value = false
+          // ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
+          //   confirmButtonText: '是',
+          //   cancelButtonText: '否',
+          //   type: 'info',
+          // }).then(() => { // 选是
+          //   resetForm()
+          //   btnLoading.value = false
+          //   nextTick(() => {
+          //     dataFormRef.value.clearValidate()
+          //   })
+          // }).catch(() => { // 选否,关闭窗口，并刷新页面
+          //   emits('watchChild')
+          //   dialogFormVisible.value = false
+          // })
         }
       }).catch((_) => { // 异常情况，loading置为false
         btnLoading.value = false
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index 0fcc508..55f30e6 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -17,7 +17,7 @@
   deviceCode: '',
   deviceType: '',
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 const columns = ref<TableColumn[]>([
   {

diff --git a/src/api/scene.ts b/src/api/scene.ts
new file mode 100644
index 0000000..0956614
--- /dev/null
+++ b/src/api/scene.ts
@@ -0,0 +1,45 @@
+/**
+ * 现场管理接口
+ */
+import request from './index'
+const prefix = 'site'
+
+// 现场列表
+export function getSceneListPage(params: object) {
+  return request({
+    url: `${prefix}/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 更新现场
+export function updateScene(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新增现场
+export function addScene(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除现场
+export function delScene(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 现场详情
+export function getSceneDetail(id: string) {
+  return request({
+    url: `${prefix}/detail?projectId=${id}`,
+    method: 'get',
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..ebaac07 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -156,13 +156,18 @@
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
+// 清除单选选中
+const clearRadio = () => {
+  console.log('清理单选选中')
+  singleChecked.value = ''
+}
 // 清除多选选中
 const clearMulti = () => {
-  console.log('清理选中')
+  console.log('清理选多选中')
   table.value!.clearSelection()
 }
 defineExpose({
-  clearMulti, initColumnsState,
+  clearMulti, initColumnsState, clearRadio,
 })
 onBeforeMount(() => {
   initColumnsState()
diff --git a/src/router/modules/scene.ts b/src/router/modules/scene.ts
index 5e24ee8..9f8388b 100644
--- a/src/router/modules/scene.ts
+++ b/src/router/modules/scene.ts
@@ -38,6 +38,30 @@
           activeMenu: '/scene',
         },
       },
+      {
+        path: 'scenedetail',
+        name: 'scenedetail',
+        component: () => import('@/views/scene/sceneDetail.vue'),
+        meta: {
+          title: '现场详情',
+          auth: '/scene',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/scene',
+        },
+      },
+      {
+        path: 'scenereport',
+        name: 'scenereport',
+        component: () => import('@/views/scene/sceneReport.vue'),
+        meta: {
+          title: '现场报告',
+          auth: '/scene',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/scene',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/device/deviceEdit.vue b/src/views/device/deviceEdit.vue
index 63d1474..2f6e4af 100644
--- a/src/views/device/deviceEdit.vue
+++ b/src/views/device/deviceEdit.vue
@@ -126,20 +126,27 @@
       btnLoading.value = true
       addDevice(deviceForm.value).then((response) => {
         if (response.code === 200) {
-          ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
-            confirmButtonText: '是',
-            cancelButtonText: '否',
-            type: 'info',
-          }).then(() => { // 选是
-            resetForm()
-            btnLoading.value = false
-            nextTick(() => {
-              dataFormRef.value.clearValidate()
-            })
-          }).catch(() => { // 选否,关闭窗口，并刷新页面
-            emits('watchChild')
-            dialogFormVisible.value = false
+          ElMessage({
+            message: '新增成功',
+            type: 'success',
           })
+          dataFormRef.value.clearValidate()
+          emits('watchChild')
+          dialogFormVisible.value = false
+          // ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
+          //   confirmButtonText: '是',
+          //   cancelButtonText: '否',
+          //   type: 'info',
+          // }).then(() => { // 选是
+          //   resetForm()
+          //   btnLoading.value = false
+          //   nextTick(() => {
+          //     dataFormRef.value.clearValidate()
+          //   })
+          // }).catch(() => { // 选否,关闭窗口，并刷新页面
+          //   emits('watchChild')
+          //   dialogFormVisible.value = false
+          // })
         }
       }).catch((_) => { // 异常情况，loading置为false
         btnLoading.value = false
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index 0fcc508..55f30e6 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -17,7 +17,7 @@
   deviceCode: '',
   deviceType: '',
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 const columns = ref<TableColumn[]>([
   {
diff --git a/src/views/person/index.vue b/src/views/person/index.vue
index f36b253..7448f74 100644
--- a/src/views/person/index.vue
+++ b/src/views/person/index.vue
@@ -82,6 +82,7 @@
 // 人脸注册
 const register = (row: any) => {
   // personRef.value.initDialog('update', {})
+  $router.push({ path: '/person/personedit', query: { type: 'update', row: JSON.stringify(row) } })
 }
 // 编辑人员
 const edit = (row: any) => {
@@ -192,7 +193,7 @@
           <template #columns>
             <el-table-column label="人脸注册" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" :disabled="scope.row.workerAvatar" size="small" @click="register(scope.row)">
+                <el-button link type="primary" :disabled="Boolean(scope.row.workerAvatar)" size="small" @click="register(scope.row)">
                   注册
                 </el-button>
               </template>

diff --git a/src/api/scene.ts b/src/api/scene.ts
new file mode 100644
index 0000000..0956614
--- /dev/null
+++ b/src/api/scene.ts
@@ -0,0 +1,45 @@
+/**
+ * 现场管理接口
+ */
+import request from './index'
+const prefix = 'site'
+
+// 现场列表
+export function getSceneListPage(params: object) {
+  return request({
+    url: `${prefix}/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 更新现场
+export function updateScene(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新增现场
+export function addScene(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除现场
+export function delScene(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 现场详情
+export function getSceneDetail(id: string) {
+  return request({
+    url: `${prefix}/detail?projectId=${id}`,
+    method: 'get',
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..ebaac07 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -156,13 +156,18 @@
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
+// 清除单选选中
+const clearRadio = () => {
+  console.log('清理单选选中')
+  singleChecked.value = ''
+}
 // 清除多选选中
 const clearMulti = () => {
-  console.log('清理选中')
+  console.log('清理选多选中')
   table.value!.clearSelection()
 }
 defineExpose({
-  clearMulti, initColumnsState,
+  clearMulti, initColumnsState, clearRadio,
 })
 onBeforeMount(() => {
   initColumnsState()
diff --git a/src/router/modules/scene.ts b/src/router/modules/scene.ts
index 5e24ee8..9f8388b 100644
--- a/src/router/modules/scene.ts
+++ b/src/router/modules/scene.ts
@@ -38,6 +38,30 @@
           activeMenu: '/scene',
         },
       },
+      {
+        path: 'scenedetail',
+        name: 'scenedetail',
+        component: () => import('@/views/scene/sceneDetail.vue'),
+        meta: {
+          title: '现场详情',
+          auth: '/scene',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/scene',
+        },
+      },
+      {
+        path: 'scenereport',
+        name: 'scenereport',
+        component: () => import('@/views/scene/sceneReport.vue'),
+        meta: {
+          title: '现场报告',
+          auth: '/scene',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/scene',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/device/deviceEdit.vue b/src/views/device/deviceEdit.vue
index 63d1474..2f6e4af 100644
--- a/src/views/device/deviceEdit.vue
+++ b/src/views/device/deviceEdit.vue
@@ -126,20 +126,27 @@
       btnLoading.value = true
       addDevice(deviceForm.value).then((response) => {
         if (response.code === 200) {
-          ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
-            confirmButtonText: '是',
-            cancelButtonText: '否',
-            type: 'info',
-          }).then(() => { // 选是
-            resetForm()
-            btnLoading.value = false
-            nextTick(() => {
-              dataFormRef.value.clearValidate()
-            })
-          }).catch(() => { // 选否,关闭窗口，并刷新页面
-            emits('watchChild')
-            dialogFormVisible.value = false
+          ElMessage({
+            message: '新增成功',
+            type: 'success',
           })
+          dataFormRef.value.clearValidate()
+          emits('watchChild')
+          dialogFormVisible.value = false
+          // ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
+          //   confirmButtonText: '是',
+          //   cancelButtonText: '否',
+          //   type: 'info',
+          // }).then(() => { // 选是
+          //   resetForm()
+          //   btnLoading.value = false
+          //   nextTick(() => {
+          //     dataFormRef.value.clearValidate()
+          //   })
+          // }).catch(() => { // 选否,关闭窗口，并刷新页面
+          //   emits('watchChild')
+          //   dialogFormVisible.value = false
+          // })
         }
       }).catch((_) => { // 异常情况，loading置为false
         btnLoading.value = false
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index 0fcc508..55f30e6 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -17,7 +17,7 @@
   deviceCode: '',
   deviceType: '',
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 const columns = ref<TableColumn[]>([
   {
diff --git a/src/views/person/index.vue b/src/views/person/index.vue
index f36b253..7448f74 100644
--- a/src/views/person/index.vue
+++ b/src/views/person/index.vue
@@ -82,6 +82,7 @@
 // 人脸注册
 const register = (row: any) => {
   // personRef.value.initDialog('update', {})
+  $router.push({ path: '/person/personedit', query: { type: 'update', row: JSON.stringify(row) } })
 }
 // 编辑人员
 const edit = (row: any) => {
@@ -192,7 +193,7 @@
           <template #columns>
             <el-table-column label="人脸注册" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" :disabled="scope.row.workerAvatar" size="small" @click="register(scope.row)">
+                <el-button link type="primary" :disabled="Boolean(scope.row.workerAvatar)" size="small" @click="register(scope.row)">
                   注册
                 </el-button>
               </template>
diff --git a/src/views/scene/components/deviceListDialog.vue b/src/views/scene/components/deviceListDialog.vue
index 2733e3a..115ba21 100644
--- a/src/views/scene/components/deviceListDialog.vue
+++ b/src/views/scene/components/deviceListDialog.vue
@@ -22,14 +22,14 @@
 const listQuery = ref({
   deviceCode: '',
   deviceType: '',
-  deviceStatus: '0',
+  projectId: '',
+  status: '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[]>([
@@ -44,7 +44,6 @@
 ])
 // 获取设备数据列表
 const fetchData = () => {
-  select.value = -1
   getDeviceListPage(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -87,7 +86,6 @@
   listQuery.value.limit = 5
   search()
   selectList.value = []
-  select.value = -1
 }
 
 // 点击保存
@@ -105,9 +103,9 @@
   }
   else {
     // 单选
-    if (select.value >= 0) {
-      const person = list.value.filter((item, index) => index == select.value)[0]
-      emits('add', Object.assign(person, { Type: deviceType.value }))
+    if (selectList.value.length > 0) {
+      const device = selectList.value[0]
+      emits('add', Object.assign(device, { Type: deviceType.value }))
       dialogFormVisible.value = false
       reset()
     }
@@ -121,8 +119,15 @@
   dialogFormVisible.value = false
   reset()
 }
+const tableRef = ref()
 // 初始化
-const initDialog = (type: string) => {
+const initDialog = (type: string, id: string) => {
+  // 清空选中状态
+  selectList.value = []
+  tableRef.value?.clearRadio()
+  tableRef.value?.clearMulti()
+  listQuery.value.projectId = id
+  // 设备类型
   deviceType.value = type
   let typeName = ''
   dialogFormVisible.value = true
@@ -142,6 +147,7 @@
     // 安全手环
     typeName = '安全树'
   }
+  // 设备类型参数
   const devicetype = deviceTypeList.value.filter(item => item.name === typeName)[0].value
   listQuery.value.deviceType = devicetype
   fetchData()
@@ -159,15 +165,15 @@
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
-      <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+      <normal-table ref="tableRef" :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">
+          <!-- <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> -->
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}

diff --git a/src/api/scene.ts b/src/api/scene.ts
new file mode 100644
index 0000000..0956614
--- /dev/null
+++ b/src/api/scene.ts
@@ -0,0 +1,45 @@
+/**
+ * 现场管理接口
+ */
+import request from './index'
+const prefix = 'site'
+
+// 现场列表
+export function getSceneListPage(params: object) {
+  return request({
+    url: `${prefix}/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 更新现场
+export function updateScene(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新增现场
+export function addScene(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除现场
+export function delScene(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 现场详情
+export function getSceneDetail(id: string) {
+  return request({
+    url: `${prefix}/detail?projectId=${id}`,
+    method: 'get',
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..ebaac07 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -156,13 +156,18 @@
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
+// 清除单选选中
+const clearRadio = () => {
+  console.log('清理单选选中')
+  singleChecked.value = ''
+}
 // 清除多选选中
 const clearMulti = () => {
-  console.log('清理选中')
+  console.log('清理选多选中')
   table.value!.clearSelection()
 }
 defineExpose({
-  clearMulti, initColumnsState,
+  clearMulti, initColumnsState, clearRadio,
 })
 onBeforeMount(() => {
   initColumnsState()
diff --git a/src/router/modules/scene.ts b/src/router/modules/scene.ts
index 5e24ee8..9f8388b 100644
--- a/src/router/modules/scene.ts
+++ b/src/router/modules/scene.ts
@@ -38,6 +38,30 @@
           activeMenu: '/scene',
         },
       },
+      {
+        path: 'scenedetail',
+        name: 'scenedetail',
+        component: () => import('@/views/scene/sceneDetail.vue'),
+        meta: {
+          title: '现场详情',
+          auth: '/scene',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/scene',
+        },
+      },
+      {
+        path: 'scenereport',
+        name: 'scenereport',
+        component: () => import('@/views/scene/sceneReport.vue'),
+        meta: {
+          title: '现场报告',
+          auth: '/scene',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/scene',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/device/deviceEdit.vue b/src/views/device/deviceEdit.vue
index 63d1474..2f6e4af 100644
--- a/src/views/device/deviceEdit.vue
+++ b/src/views/device/deviceEdit.vue
@@ -126,20 +126,27 @@
       btnLoading.value = true
       addDevice(deviceForm.value).then((response) => {
         if (response.code === 200) {
-          ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
-            confirmButtonText: '是',
-            cancelButtonText: '否',
-            type: 'info',
-          }).then(() => { // 选是
-            resetForm()
-            btnLoading.value = false
-            nextTick(() => {
-              dataFormRef.value.clearValidate()
-            })
-          }).catch(() => { // 选否,关闭窗口，并刷新页面
-            emits('watchChild')
-            dialogFormVisible.value = false
+          ElMessage({
+            message: '新增成功',
+            type: 'success',
           })
+          dataFormRef.value.clearValidate()
+          emits('watchChild')
+          dialogFormVisible.value = false
+          // ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
+          //   confirmButtonText: '是',
+          //   cancelButtonText: '否',
+          //   type: 'info',
+          // }).then(() => { // 选是
+          //   resetForm()
+          //   btnLoading.value = false
+          //   nextTick(() => {
+          //     dataFormRef.value.clearValidate()
+          //   })
+          // }).catch(() => { // 选否,关闭窗口，并刷新页面
+          //   emits('watchChild')
+          //   dialogFormVisible.value = false
+          // })
         }
       }).catch((_) => { // 异常情况，loading置为false
         btnLoading.value = false
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index 0fcc508..55f30e6 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -17,7 +17,7 @@
   deviceCode: '',
   deviceType: '',
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 const columns = ref<TableColumn[]>([
   {
diff --git a/src/views/person/index.vue b/src/views/person/index.vue
index f36b253..7448f74 100644
--- a/src/views/person/index.vue
+++ b/src/views/person/index.vue
@@ -82,6 +82,7 @@
 // 人脸注册
 const register = (row: any) => {
   // personRef.value.initDialog('update', {})
+  $router.push({ path: '/person/personedit', query: { type: 'update', row: JSON.stringify(row) } })
 }
 // 编辑人员
 const edit = (row: any) => {
@@ -192,7 +193,7 @@
           <template #columns>
             <el-table-column label="人脸注册" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" :disabled="scope.row.workerAvatar" size="small" @click="register(scope.row)">
+                <el-button link type="primary" :disabled="Boolean(scope.row.workerAvatar)" size="small" @click="register(scope.row)">
                   注册
                 </el-button>
               </template>
diff --git a/src/views/scene/components/deviceListDialog.vue b/src/views/scene/components/deviceListDialog.vue
index 2733e3a..115ba21 100644
--- a/src/views/scene/components/deviceListDialog.vue
+++ b/src/views/scene/components/deviceListDialog.vue
@@ -22,14 +22,14 @@
 const listQuery = ref({
   deviceCode: '',
   deviceType: '',
-  deviceStatus: '0',
+  projectId: '',
+  status: '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[]>([
@@ -44,7 +44,6 @@
 ])
 // 获取设备数据列表
 const fetchData = () => {
-  select.value = -1
   getDeviceListPage(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -87,7 +86,6 @@
   listQuery.value.limit = 5
   search()
   selectList.value = []
-  select.value = -1
 }
 
 // 点击保存
@@ -105,9 +103,9 @@
   }
   else {
     // 单选
-    if (select.value >= 0) {
-      const person = list.value.filter((item, index) => index == select.value)[0]
-      emits('add', Object.assign(person, { Type: deviceType.value }))
+    if (selectList.value.length > 0) {
+      const device = selectList.value[0]
+      emits('add', Object.assign(device, { Type: deviceType.value }))
       dialogFormVisible.value = false
       reset()
     }
@@ -121,8 +119,15 @@
   dialogFormVisible.value = false
   reset()
 }
+const tableRef = ref()
 // 初始化
-const initDialog = (type: string) => {
+const initDialog = (type: string, id: string) => {
+  // 清空选中状态
+  selectList.value = []
+  tableRef.value?.clearRadio()
+  tableRef.value?.clearMulti()
+  listQuery.value.projectId = id
+  // 设备类型
   deviceType.value = type
   let typeName = ''
   dialogFormVisible.value = true
@@ -142,6 +147,7 @@
     // 安全手环
     typeName = '安全树'
   }
+  // 设备类型参数
   const devicetype = deviceTypeList.value.filter(item => item.name === typeName)[0].value
   listQuery.value.deviceType = devicetype
   fetchData()
@@ -159,15 +165,15 @@
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
-      <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+      <normal-table ref="tableRef" :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">
+          <!-- <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> -->
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
diff --git a/src/views/scene/components/personTable.vue b/src/views/scene/components/personTable.vue
index 35e82c3..8896f85 100644
--- a/src/views/scene/components/personTable.vue
+++ b/src/views/scene/components/personTable.vue
@@ -9,8 +9,22 @@
 import deviceList from './deviceListDialog.vue'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
-
+const props = defineProps({
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const $route = useRoute()
 const userListData = ref<any[]>([])
+watch(() => props.list, (newVal) => {
+  if (newVal.length) {
+    userListData.value = JSON.parse(JSON.stringify(newVal))
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 // 表格被选中的行
 const selectList = ref<any[]>([])
 // 表格多选
@@ -40,8 +54,12 @@
 }
 // 选择设备
 const selectDevice = (index: number, type: string) => {
+  let id = ''
+  if ($route.query.id as string) {
+    id = $route.query.id as string
+  }
   personIndex.value = index
-  selectDeviceRef.value.initDialog(type)
+  selectDeviceRef.value.initDialog(type, id)
 }
 // 选中的作业人员
 const confirmPerson = (row: any) => {
@@ -49,6 +67,8 @@
   person.workerName = row.workerName
   person.phoneNumber = row.phoneNumber
   person.deptId = row.deptId
+  person.workerDeptName = row.deptName
+  person.workerId = row.id
 }
 // 选中的设备
 const confirmDevice = (row: any) => {
@@ -61,17 +81,20 @@
   userListData.value.push({
     edit: true,
     workerName: '',
-    phoneNumber: '',
+    workerPhoneNumber: '',
     deptId: '',
+    workerDeptName: '',
     braceletCode: '', // 手环编号
     hatCode: '', // 安全帽编号
     vastCode: '', // 背心编号
-    id: '', // 人员id
+    workerId: '', // 人员id
   })
 }
 // 删除人员
 const del = () => {
-
+  userListData.value = userListData.value.filter((item) => {
+    return !selectList.value.includes(item)
+  })
 }
 // 编辑人员
 const edit = (index: number) => {
@@ -85,6 +108,7 @@
   }
   userListData.value[index].edit = false
 }
+defineExpose({ userListData })
 </script>
 
 <template>
@@ -110,16 +134,15 @@
         </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>
+            <!-- <el-input v-if="scope.row.edit" v-model.trim="scope.row.phoneNumber" placeholder="联系方式" /> -->
+            <div style="height:32px;line-height: 32px;">{{ scope.row.workerPhoneNumber }}</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>
+            <!-- <dept-select v-if="scope.row.edit" v-model="scope.row.deptId" :data="deptTreeList" placeholder="所属部门"
+              style="width: 100%;" /> -->
+            <div style="height:32px;line-height: 32px;"> {{ scope.row.workerDeptName }} </div>
           </template>
         </el-table-column>
         <el-table-column label="挂载安全帽编号" align="center">
@@ -133,14 +156,14 @@
           <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>
+            <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>
+            <div v-else style="height:32px;line-height: 32px;">{{ scope.row.braceletCode }}</div>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center">
@@ -171,4 +194,5 @@
     margin-bottom: 0 !important;
   }
 
-}</style>
+}
+</style>

diff --git a/src/api/scene.ts b/src/api/scene.ts
new file mode 100644
index 0000000..0956614
--- /dev/null
+++ b/src/api/scene.ts
@@ -0,0 +1,45 @@
+/**
+ * 现场管理接口
+ */
+import request from './index'
+const prefix = 'site'
+
+// 现场列表
+export function getSceneListPage(params: object) {
+  return request({
+    url: `${prefix}/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 更新现场
+export function updateScene(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新增现场
+export function addScene(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除现场
+export function delScene(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 现场详情
+export function getSceneDetail(id: string) {
+  return request({
+    url: `${prefix}/detail?projectId=${id}`,
+    method: 'get',
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..ebaac07 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -156,13 +156,18 @@
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
+// 清除单选选中
+const clearRadio = () => {
+  console.log('清理单选选中')
+  singleChecked.value = ''
+}
 // 清除多选选中
 const clearMulti = () => {
-  console.log('清理选中')
+  console.log('清理选多选中')
   table.value!.clearSelection()
 }
 defineExpose({
-  clearMulti, initColumnsState,
+  clearMulti, initColumnsState, clearRadio,
 })
 onBeforeMount(() => {
   initColumnsState()
diff --git a/src/router/modules/scene.ts b/src/router/modules/scene.ts
index 5e24ee8..9f8388b 100644
--- a/src/router/modules/scene.ts
+++ b/src/router/modules/scene.ts
@@ -38,6 +38,30 @@
           activeMenu: '/scene',
         },
       },
+      {
+        path: 'scenedetail',
+        name: 'scenedetail',
+        component: () => import('@/views/scene/sceneDetail.vue'),
+        meta: {
+          title: '现场详情',
+          auth: '/scene',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/scene',
+        },
+      },
+      {
+        path: 'scenereport',
+        name: 'scenereport',
+        component: () => import('@/views/scene/sceneReport.vue'),
+        meta: {
+          title: '现场报告',
+          auth: '/scene',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/scene',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/device/deviceEdit.vue b/src/views/device/deviceEdit.vue
index 63d1474..2f6e4af 100644
--- a/src/views/device/deviceEdit.vue
+++ b/src/views/device/deviceEdit.vue
@@ -126,20 +126,27 @@
       btnLoading.value = true
       addDevice(deviceForm.value).then((response) => {
         if (response.code === 200) {
-          ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
-            confirmButtonText: '是',
-            cancelButtonText: '否',
-            type: 'info',
-          }).then(() => { // 选是
-            resetForm()
-            btnLoading.value = false
-            nextTick(() => {
-              dataFormRef.value.clearValidate()
-            })
-          }).catch(() => { // 选否,关闭窗口，并刷新页面
-            emits('watchChild')
-            dialogFormVisible.value = false
+          ElMessage({
+            message: '新增成功',
+            type: 'success',
           })
+          dataFormRef.value.clearValidate()
+          emits('watchChild')
+          dialogFormVisible.value = false
+          // ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
+          //   confirmButtonText: '是',
+          //   cancelButtonText: '否',
+          //   type: 'info',
+          // }).then(() => { // 选是
+          //   resetForm()
+          //   btnLoading.value = false
+          //   nextTick(() => {
+          //     dataFormRef.value.clearValidate()
+          //   })
+          // }).catch(() => { // 选否,关闭窗口，并刷新页面
+          //   emits('watchChild')
+          //   dialogFormVisible.value = false
+          // })
         }
       }).catch((_) => { // 异常情况，loading置为false
         btnLoading.value = false
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index 0fcc508..55f30e6 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -17,7 +17,7 @@
   deviceCode: '',
   deviceType: '',
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 const columns = ref<TableColumn[]>([
   {
diff --git a/src/views/person/index.vue b/src/views/person/index.vue
index f36b253..7448f74 100644
--- a/src/views/person/index.vue
+++ b/src/views/person/index.vue
@@ -82,6 +82,7 @@
 // 人脸注册
 const register = (row: any) => {
   // personRef.value.initDialog('update', {})
+  $router.push({ path: '/person/personedit', query: { type: 'update', row: JSON.stringify(row) } })
 }
 // 编辑人员
 const edit = (row: any) => {
@@ -192,7 +193,7 @@
           <template #columns>
             <el-table-column label="人脸注册" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" :disabled="scope.row.workerAvatar" size="small" @click="register(scope.row)">
+                <el-button link type="primary" :disabled="Boolean(scope.row.workerAvatar)" size="small" @click="register(scope.row)">
                   注册
                 </el-button>
               </template>
diff --git a/src/views/scene/components/deviceListDialog.vue b/src/views/scene/components/deviceListDialog.vue
index 2733e3a..115ba21 100644
--- a/src/views/scene/components/deviceListDialog.vue
+++ b/src/views/scene/components/deviceListDialog.vue
@@ -22,14 +22,14 @@
 const listQuery = ref({
   deviceCode: '',
   deviceType: '',
-  deviceStatus: '0',
+  projectId: '',
+  status: '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[]>([
@@ -44,7 +44,6 @@
 ])
 // 获取设备数据列表
 const fetchData = () => {
-  select.value = -1
   getDeviceListPage(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -87,7 +86,6 @@
   listQuery.value.limit = 5
   search()
   selectList.value = []
-  select.value = -1
 }
 
 // 点击保存
@@ -105,9 +103,9 @@
   }
   else {
     // 单选
-    if (select.value >= 0) {
-      const person = list.value.filter((item, index) => index == select.value)[0]
-      emits('add', Object.assign(person, { Type: deviceType.value }))
+    if (selectList.value.length > 0) {
+      const device = selectList.value[0]
+      emits('add', Object.assign(device, { Type: deviceType.value }))
       dialogFormVisible.value = false
       reset()
     }
@@ -121,8 +119,15 @@
   dialogFormVisible.value = false
   reset()
 }
+const tableRef = ref()
 // 初始化
-const initDialog = (type: string) => {
+const initDialog = (type: string, id: string) => {
+  // 清空选中状态
+  selectList.value = []
+  tableRef.value?.clearRadio()
+  tableRef.value?.clearMulti()
+  listQuery.value.projectId = id
+  // 设备类型
   deviceType.value = type
   let typeName = ''
   dialogFormVisible.value = true
@@ -142,6 +147,7 @@
     // 安全手环
     typeName = '安全树'
   }
+  // 设备类型参数
   const devicetype = deviceTypeList.value.filter(item => item.name === typeName)[0].value
   listQuery.value.deviceType = devicetype
   fetchData()
@@ -159,15 +165,15 @@
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
-      <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+      <normal-table ref="tableRef" :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">
+          <!-- <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> -->
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
diff --git a/src/views/scene/components/personTable.vue b/src/views/scene/components/personTable.vue
index 35e82c3..8896f85 100644
--- a/src/views/scene/components/personTable.vue
+++ b/src/views/scene/components/personTable.vue
@@ -9,8 +9,22 @@
 import deviceList from './deviceListDialog.vue'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
-
+const props = defineProps({
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const $route = useRoute()
 const userListData = ref<any[]>([])
+watch(() => props.list, (newVal) => {
+  if (newVal.length) {
+    userListData.value = JSON.parse(JSON.stringify(newVal))
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 // 表格被选中的行
 const selectList = ref<any[]>([])
 // 表格多选
@@ -40,8 +54,12 @@
 }
 // 选择设备
 const selectDevice = (index: number, type: string) => {
+  let id = ''
+  if ($route.query.id as string) {
+    id = $route.query.id as string
+  }
   personIndex.value = index
-  selectDeviceRef.value.initDialog(type)
+  selectDeviceRef.value.initDialog(type, id)
 }
 // 选中的作业人员
 const confirmPerson = (row: any) => {
@@ -49,6 +67,8 @@
   person.workerName = row.workerName
   person.phoneNumber = row.phoneNumber
   person.deptId = row.deptId
+  person.workerDeptName = row.deptName
+  person.workerId = row.id
 }
 // 选中的设备
 const confirmDevice = (row: any) => {
@@ -61,17 +81,20 @@
   userListData.value.push({
     edit: true,
     workerName: '',
-    phoneNumber: '',
+    workerPhoneNumber: '',
     deptId: '',
+    workerDeptName: '',
     braceletCode: '', // 手环编号
     hatCode: '', // 安全帽编号
     vastCode: '', // 背心编号
-    id: '', // 人员id
+    workerId: '', // 人员id
   })
 }
 // 删除人员
 const del = () => {
-
+  userListData.value = userListData.value.filter((item) => {
+    return !selectList.value.includes(item)
+  })
 }
 // 编辑人员
 const edit = (index: number) => {
@@ -85,6 +108,7 @@
   }
   userListData.value[index].edit = false
 }
+defineExpose({ userListData })
 </script>
 
 <template>
@@ -110,16 +134,15 @@
         </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>
+            <!-- <el-input v-if="scope.row.edit" v-model.trim="scope.row.phoneNumber" placeholder="联系方式" /> -->
+            <div style="height:32px;line-height: 32px;">{{ scope.row.workerPhoneNumber }}</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>
+            <!-- <dept-select v-if="scope.row.edit" v-model="scope.row.deptId" :data="deptTreeList" placeholder="所属部门"
+              style="width: 100%;" /> -->
+            <div style="height:32px;line-height: 32px;"> {{ scope.row.workerDeptName }} </div>
           </template>
         </el-table-column>
         <el-table-column label="挂载安全帽编号" align="center">
@@ -133,14 +156,14 @@
           <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>
+            <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>
+            <div v-else style="height:32px;line-height: 32px;">{{ scope.row.braceletCode }}</div>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center">
@@ -171,4 +194,5 @@
     margin-bottom: 0 !important;
   }
 
-}</style>
+}
+</style>
diff --git a/src/views/scene/index.vue b/src/views/scene/index.vue
index 26f3014..9b3b4fa 100644
--- a/src/views/scene/index.vue
+++ b/src/views/scene/index.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="ListLog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { getSceneListPage, delScene } from '@/api/scene'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
@@ -18,136 +19,62 @@
 const columns = ref([
   {
     text: '作业名称',
-    value: '1',
+    value: 'workTitle',
     align: 'center',
     // width: 170,
   },
   {
     text: '所属道路',
-    value: '2',
+    value: 'workRoad',
     align: 'center',
     // width: 100,
   },
   {
     text: '作业简介',
-    value: '3',
+    value: 'workSiteDesc',
     align: 'center',
   },
   {
     text: '负责人',
-    value: '4',
+    value: 'workPersonName',
     align: 'center',
   },
   {
     text: '负责人联系方式',
-    value: '5',
+    value: 'workPersonPhoneNumber',
     align: 'center',
   },
   {
     text: '注册时间',
-    value: '6',
+    value: 'registerTime',
     align: 'center',
   },
   {
     text: '当前状态',
-    value: '7',
+    value: 'projectStateName',
     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:'xxxxxx',
-      4:'张三',
-      5:'1370000000',
-      6:'2020-02-02',
-      7:'进行中'
-    },
-    {
-      1:'作业二',
-      2:'长安路',
-      3:'xxxxx',
-      4:'李四',
-      5:'1572000000',
-      6:'2023-04-01',
-      7:'已完成'
-    },
-    {
-      1:'作业三',
-      2:'学院路',
-      3:'xxxx',
-      4:'王五',
-      5:'183123123123',
-      6:'2021-01-01',
-      7:'未开始'
-    },
-  ]
-  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()
-    //   }
-    // })
+  getSceneListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
   })
 }
+fetchData()
 
 // 查询数据
 const search = () => {
   fetchData()
 }
 
-// 获取日志类型
-// const fetchLogType = () => {
-//   getLogType().then((response) => {
-//     logTypeList.value = response.data
-//   })
-// }
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
   if (val && val.size) {
@@ -170,7 +97,15 @@
 }
 // 编辑
 const edit = (row: any) => {
-  // editRef.value.initDialog('update', row)
+  $router.push({ path: '/scene/sceneedit', query: { id: row.id } })
+}
+// 详情
+const detail = (row: any) => {
+  $router.push({ path: '/scene/scenedetail', query: { id: row.id } })
+}
+// 报告
+const report = (row: any) => {
+  $router.push({ path: '/scene/scenereport', query: { id: row.id } })
 }
 // 删除
 const del = () => {
@@ -182,12 +117,13 @@
     }).then((res) => {
       // 点击确认
       const ids = selectList.value.map(item => item.id)
-      // delDevice(ids).then((res) => {
-      //   if (res.code === 200) {
-      //     selectList.value = []
-      //     fetchData()
-      //   }
-      // })
+      delScene(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
     }).catch(() => {
       // 点击取消
       selectList.value = []
@@ -206,11 +142,7 @@
       <!-- 筛选条件 -->
       <search-area @search="search">
         <search-item>
-          <el-input
-            v-model.trim="listQuery.beginTime"
-            placeholder="作业名称"
-            clearable
-          />
+          <el-input v-model.trim="listQuery.beginTime" placeholder="作业名称" clearable />
         </search-item>
         <search-item>
           <el-select v-model="listQuery.beginTime" clearable placeholder="所属街道">
@@ -218,27 +150,15 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.beginTime"
-            placeholder="责任人"
-            clearable
-          />
+          <el-input v-model.trim="listQuery.beginTime" placeholder="责任人" clearable />
         </search-item>
         <search-item>
-          <el-date-picker
-            v-model="listQuery.beginTime"
-            type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
-            placeholder="注册开始时间"
-          />
+          <el-date-picker v-model="listQuery.beginTime" 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"
-            placeholder="注册结束时间"
-          />
+          <el-date-picker v-model="listQuery.endTime" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
+            placeholder="注册结束时间" />
         </search-item>
         <search-item>
           <el-select v-model="listQuery.beginTime" clearable placeholder="当前状态">
@@ -246,39 +166,22 @@
           </el-select>
         </search-item>
         <template #btns>
-          <el-button
-            class="search-btn"
-            type="primary"
-            @click="add"
-          >
+          <el-button class="search-btn" type="primary" @click="add">
             新增
           </el-button>
-          <el-button
-            class="search-btn"
-            type="info"
-            @click="del"
-          >
+          <el-button class="search-btn" type="info" @click="del">
             删除
           </el-button>
         </template>
       </search-area>
       <table-container>
         <!-- 查询结果Table显示 -->
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :is-showmulti-select="true"
-          :is-multi="true"
-          :list-loading="listLoading"
-          @change="changePage"
-          @multi-select="multiSelect"
-        >
+        <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :is-showmulti-select="true"
+          :is-multi="true" :list-loading="listLoading" @change="changePage" @multi-select="multiSelect">
           <template #columns>
             <el-table-column label="编辑" width="70" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="detail(scope.row)">
+                <el-button link type="primary" size="small" @click="edit(scope.row)">
                   编辑
                 </el-button>
               </template>
@@ -292,7 +195,7 @@
             </el-table-column>
             <el-table-column label="作业报告" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="detail(scope.row)">
+                <el-button link type="primary" size="small" @click="report(scope.row)">
                   作业报告
                 </el-button>
               </template>

diff --git a/src/api/scene.ts b/src/api/scene.ts
new file mode 100644
index 0000000..0956614
--- /dev/null
+++ b/src/api/scene.ts
@@ -0,0 +1,45 @@
+/**
+ * 现场管理接口
+ */
+import request from './index'
+const prefix = 'site'
+
+// 现场列表
+export function getSceneListPage(params: object) {
+  return request({
+    url: `${prefix}/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 更新现场
+export function updateScene(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新增现场
+export function addScene(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除现场
+export function delScene(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 现场详情
+export function getSceneDetail(id: string) {
+  return request({
+    url: `${prefix}/detail?projectId=${id}`,
+    method: 'get',
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..ebaac07 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -156,13 +156,18 @@
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
+// 清除单选选中
+const clearRadio = () => {
+  console.log('清理单选选中')
+  singleChecked.value = ''
+}
 // 清除多选选中
 const clearMulti = () => {
-  console.log('清理选中')
+  console.log('清理选多选中')
   table.value!.clearSelection()
 }
 defineExpose({
-  clearMulti, initColumnsState,
+  clearMulti, initColumnsState, clearRadio,
 })
 onBeforeMount(() => {
   initColumnsState()
diff --git a/src/router/modules/scene.ts b/src/router/modules/scene.ts
index 5e24ee8..9f8388b 100644
--- a/src/router/modules/scene.ts
+++ b/src/router/modules/scene.ts
@@ -38,6 +38,30 @@
           activeMenu: '/scene',
         },
       },
+      {
+        path: 'scenedetail',
+        name: 'scenedetail',
+        component: () => import('@/views/scene/sceneDetail.vue'),
+        meta: {
+          title: '现场详情',
+          auth: '/scene',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/scene',
+        },
+      },
+      {
+        path: 'scenereport',
+        name: 'scenereport',
+        component: () => import('@/views/scene/sceneReport.vue'),
+        meta: {
+          title: '现场报告',
+          auth: '/scene',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/scene',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/device/deviceEdit.vue b/src/views/device/deviceEdit.vue
index 63d1474..2f6e4af 100644
--- a/src/views/device/deviceEdit.vue
+++ b/src/views/device/deviceEdit.vue
@@ -126,20 +126,27 @@
       btnLoading.value = true
       addDevice(deviceForm.value).then((response) => {
         if (response.code === 200) {
-          ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
-            confirmButtonText: '是',
-            cancelButtonText: '否',
-            type: 'info',
-          }).then(() => { // 选是
-            resetForm()
-            btnLoading.value = false
-            nextTick(() => {
-              dataFormRef.value.clearValidate()
-            })
-          }).catch(() => { // 选否,关闭窗口，并刷新页面
-            emits('watchChild')
-            dialogFormVisible.value = false
+          ElMessage({
+            message: '新增成功',
+            type: 'success',
           })
+          dataFormRef.value.clearValidate()
+          emits('watchChild')
+          dialogFormVisible.value = false
+          // ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
+          //   confirmButtonText: '是',
+          //   cancelButtonText: '否',
+          //   type: 'info',
+          // }).then(() => { // 选是
+          //   resetForm()
+          //   btnLoading.value = false
+          //   nextTick(() => {
+          //     dataFormRef.value.clearValidate()
+          //   })
+          // }).catch(() => { // 选否,关闭窗口，并刷新页面
+          //   emits('watchChild')
+          //   dialogFormVisible.value = false
+          // })
         }
       }).catch((_) => { // 异常情况，loading置为false
         btnLoading.value = false
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index 0fcc508..55f30e6 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -17,7 +17,7 @@
   deviceCode: '',
   deviceType: '',
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 const columns = ref<TableColumn[]>([
   {
diff --git a/src/views/person/index.vue b/src/views/person/index.vue
index f36b253..7448f74 100644
--- a/src/views/person/index.vue
+++ b/src/views/person/index.vue
@@ -82,6 +82,7 @@
 // 人脸注册
 const register = (row: any) => {
   // personRef.value.initDialog('update', {})
+  $router.push({ path: '/person/personedit', query: { type: 'update', row: JSON.stringify(row) } })
 }
 // 编辑人员
 const edit = (row: any) => {
@@ -192,7 +193,7 @@
           <template #columns>
             <el-table-column label="人脸注册" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" :disabled="scope.row.workerAvatar" size="small" @click="register(scope.row)">
+                <el-button link type="primary" :disabled="Boolean(scope.row.workerAvatar)" size="small" @click="register(scope.row)">
                   注册
                 </el-button>
               </template>
diff --git a/src/views/scene/components/deviceListDialog.vue b/src/views/scene/components/deviceListDialog.vue
index 2733e3a..115ba21 100644
--- a/src/views/scene/components/deviceListDialog.vue
+++ b/src/views/scene/components/deviceListDialog.vue
@@ -22,14 +22,14 @@
 const listQuery = ref({
   deviceCode: '',
   deviceType: '',
-  deviceStatus: '0',
+  projectId: '',
+  status: '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[]>([
@@ -44,7 +44,6 @@
 ])
 // 获取设备数据列表
 const fetchData = () => {
-  select.value = -1
   getDeviceListPage(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -87,7 +86,6 @@
   listQuery.value.limit = 5
   search()
   selectList.value = []
-  select.value = -1
 }
 
 // 点击保存
@@ -105,9 +103,9 @@
   }
   else {
     // 单选
-    if (select.value >= 0) {
-      const person = list.value.filter((item, index) => index == select.value)[0]
-      emits('add', Object.assign(person, { Type: deviceType.value }))
+    if (selectList.value.length > 0) {
+      const device = selectList.value[0]
+      emits('add', Object.assign(device, { Type: deviceType.value }))
       dialogFormVisible.value = false
       reset()
     }
@@ -121,8 +119,15 @@
   dialogFormVisible.value = false
   reset()
 }
+const tableRef = ref()
 // 初始化
-const initDialog = (type: string) => {
+const initDialog = (type: string, id: string) => {
+  // 清空选中状态
+  selectList.value = []
+  tableRef.value?.clearRadio()
+  tableRef.value?.clearMulti()
+  listQuery.value.projectId = id
+  // 设备类型
   deviceType.value = type
   let typeName = ''
   dialogFormVisible.value = true
@@ -142,6 +147,7 @@
     // 安全手环
     typeName = '安全树'
   }
+  // 设备类型参数
   const devicetype = deviceTypeList.value.filter(item => item.name === typeName)[0].value
   listQuery.value.deviceType = devicetype
   fetchData()
@@ -159,15 +165,15 @@
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
-      <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+      <normal-table ref="tableRef" :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">
+          <!-- <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> -->
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
diff --git a/src/views/scene/components/personTable.vue b/src/views/scene/components/personTable.vue
index 35e82c3..8896f85 100644
--- a/src/views/scene/components/personTable.vue
+++ b/src/views/scene/components/personTable.vue
@@ -9,8 +9,22 @@
 import deviceList from './deviceListDialog.vue'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
-
+const props = defineProps({
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const $route = useRoute()
 const userListData = ref<any[]>([])
+watch(() => props.list, (newVal) => {
+  if (newVal.length) {
+    userListData.value = JSON.parse(JSON.stringify(newVal))
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 // 表格被选中的行
 const selectList = ref<any[]>([])
 // 表格多选
@@ -40,8 +54,12 @@
 }
 // 选择设备
 const selectDevice = (index: number, type: string) => {
+  let id = ''
+  if ($route.query.id as string) {
+    id = $route.query.id as string
+  }
   personIndex.value = index
-  selectDeviceRef.value.initDialog(type)
+  selectDeviceRef.value.initDialog(type, id)
 }
 // 选中的作业人员
 const confirmPerson = (row: any) => {
@@ -49,6 +67,8 @@
   person.workerName = row.workerName
   person.phoneNumber = row.phoneNumber
   person.deptId = row.deptId
+  person.workerDeptName = row.deptName
+  person.workerId = row.id
 }
 // 选中的设备
 const confirmDevice = (row: any) => {
@@ -61,17 +81,20 @@
   userListData.value.push({
     edit: true,
     workerName: '',
-    phoneNumber: '',
+    workerPhoneNumber: '',
     deptId: '',
+    workerDeptName: '',
     braceletCode: '', // 手环编号
     hatCode: '', // 安全帽编号
     vastCode: '', // 背心编号
-    id: '', // 人员id
+    workerId: '', // 人员id
   })
 }
 // 删除人员
 const del = () => {
-
+  userListData.value = userListData.value.filter((item) => {
+    return !selectList.value.includes(item)
+  })
 }
 // 编辑人员
 const edit = (index: number) => {
@@ -85,6 +108,7 @@
   }
   userListData.value[index].edit = false
 }
+defineExpose({ userListData })
 </script>
 
 <template>
@@ -110,16 +134,15 @@
         </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>
+            <!-- <el-input v-if="scope.row.edit" v-model.trim="scope.row.phoneNumber" placeholder="联系方式" /> -->
+            <div style="height:32px;line-height: 32px;">{{ scope.row.workerPhoneNumber }}</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>
+            <!-- <dept-select v-if="scope.row.edit" v-model="scope.row.deptId" :data="deptTreeList" placeholder="所属部门"
+              style="width: 100%;" /> -->
+            <div style="height:32px;line-height: 32px;"> {{ scope.row.workerDeptName }} </div>
           </template>
         </el-table-column>
         <el-table-column label="挂载安全帽编号" align="center">
@@ -133,14 +156,14 @@
           <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>
+            <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>
+            <div v-else style="height:32px;line-height: 32px;">{{ scope.row.braceletCode }}</div>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center">
@@ -171,4 +194,5 @@
     margin-bottom: 0 !important;
   }
 
-}</style>
+}
+</style>
diff --git a/src/views/scene/index.vue b/src/views/scene/index.vue
index 26f3014..9b3b4fa 100644
--- a/src/views/scene/index.vue
+++ b/src/views/scene/index.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="ListLog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { getSceneListPage, delScene } from '@/api/scene'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
@@ -18,136 +19,62 @@
 const columns = ref([
   {
     text: '作业名称',
-    value: '1',
+    value: 'workTitle',
     align: 'center',
     // width: 170,
   },
   {
     text: '所属道路',
-    value: '2',
+    value: 'workRoad',
     align: 'center',
     // width: 100,
   },
   {
     text: '作业简介',
-    value: '3',
+    value: 'workSiteDesc',
     align: 'center',
   },
   {
     text: '负责人',
-    value: '4',
+    value: 'workPersonName',
     align: 'center',
   },
   {
     text: '负责人联系方式',
-    value: '5',
+    value: 'workPersonPhoneNumber',
     align: 'center',
   },
   {
     text: '注册时间',
-    value: '6',
+    value: 'registerTime',
     align: 'center',
   },
   {
     text: '当前状态',
-    value: '7',
+    value: 'projectStateName',
     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:'xxxxxx',
-      4:'张三',
-      5:'1370000000',
-      6:'2020-02-02',
-      7:'进行中'
-    },
-    {
-      1:'作业二',
-      2:'长安路',
-      3:'xxxxx',
-      4:'李四',
-      5:'1572000000',
-      6:'2023-04-01',
-      7:'已完成'
-    },
-    {
-      1:'作业三',
-      2:'学院路',
-      3:'xxxx',
-      4:'王五',
-      5:'183123123123',
-      6:'2021-01-01',
-      7:'未开始'
-    },
-  ]
-  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()
-    //   }
-    // })
+  getSceneListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
   })
 }
+fetchData()
 
 // 查询数据
 const search = () => {
   fetchData()
 }
 
-// 获取日志类型
-// const fetchLogType = () => {
-//   getLogType().then((response) => {
-//     logTypeList.value = response.data
-//   })
-// }
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
   if (val && val.size) {
@@ -170,7 +97,15 @@
 }
 // 编辑
 const edit = (row: any) => {
-  // editRef.value.initDialog('update', row)
+  $router.push({ path: '/scene/sceneedit', query: { id: row.id } })
+}
+// 详情
+const detail = (row: any) => {
+  $router.push({ path: '/scene/scenedetail', query: { id: row.id } })
+}
+// 报告
+const report = (row: any) => {
+  $router.push({ path: '/scene/scenereport', query: { id: row.id } })
 }
 // 删除
 const del = () => {
@@ -182,12 +117,13 @@
     }).then((res) => {
       // 点击确认
       const ids = selectList.value.map(item => item.id)
-      // delDevice(ids).then((res) => {
-      //   if (res.code === 200) {
-      //     selectList.value = []
-      //     fetchData()
-      //   }
-      // })
+      delScene(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
     }).catch(() => {
       // 点击取消
       selectList.value = []
@@ -206,11 +142,7 @@
       <!-- 筛选条件 -->
       <search-area @search="search">
         <search-item>
-          <el-input
-            v-model.trim="listQuery.beginTime"
-            placeholder="作业名称"
-            clearable
-          />
+          <el-input v-model.trim="listQuery.beginTime" placeholder="作业名称" clearable />
         </search-item>
         <search-item>
           <el-select v-model="listQuery.beginTime" clearable placeholder="所属街道">
@@ -218,27 +150,15 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.beginTime"
-            placeholder="责任人"
-            clearable
-          />
+          <el-input v-model.trim="listQuery.beginTime" placeholder="责任人" clearable />
         </search-item>
         <search-item>
-          <el-date-picker
-            v-model="listQuery.beginTime"
-            type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
-            placeholder="注册开始时间"
-          />
+          <el-date-picker v-model="listQuery.beginTime" 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"
-            placeholder="注册结束时间"
-          />
+          <el-date-picker v-model="listQuery.endTime" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
+            placeholder="注册结束时间" />
         </search-item>
         <search-item>
           <el-select v-model="listQuery.beginTime" clearable placeholder="当前状态">
@@ -246,39 +166,22 @@
           </el-select>
         </search-item>
         <template #btns>
-          <el-button
-            class="search-btn"
-            type="primary"
-            @click="add"
-          >
+          <el-button class="search-btn" type="primary" @click="add">
             新增
           </el-button>
-          <el-button
-            class="search-btn"
-            type="info"
-            @click="del"
-          >
+          <el-button class="search-btn" type="info" @click="del">
             删除
           </el-button>
         </template>
       </search-area>
       <table-container>
         <!-- 查询结果Table显示 -->
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :is-showmulti-select="true"
-          :is-multi="true"
-          :list-loading="listLoading"
-          @change="changePage"
-          @multi-select="multiSelect"
-        >
+        <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :is-showmulti-select="true"
+          :is-multi="true" :list-loading="listLoading" @change="changePage" @multi-select="multiSelect">
           <template #columns>
             <el-table-column label="编辑" width="70" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="detail(scope.row)">
+                <el-button link type="primary" size="small" @click="edit(scope.row)">
                   编辑
                 </el-button>
               </template>
@@ -292,7 +195,7 @@
             </el-table-column>
             <el-table-column label="作业报告" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="detail(scope.row)">
+                <el-button link type="primary" size="small" @click="report(scope.row)">
                   作业报告
                 </el-button>
               </template>
diff --git a/src/views/scene/sceneDetail.vue b/src/views/scene/sceneDetail.vue
new file mode 100644
index 0000000..e4909f8
--- /dev/null
+++ b/src/views/scene/sceneDetail.vue
@@ -0,0 +1,13 @@
+<!--
+  Description: 现场管理详情
+  Author: 李亚光
+  Date: 2023-05-04
+ -->
+<script lang="ts" setup name="sceneEdit">
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    现场管理详情
+  </app-container>
+</template>

diff --git a/src/api/scene.ts b/src/api/scene.ts
new file mode 100644
index 0000000..0956614
--- /dev/null
+++ b/src/api/scene.ts
@@ -0,0 +1,45 @@
+/**
+ * 现场管理接口
+ */
+import request from './index'
+const prefix = 'site'
+
+// 现场列表
+export function getSceneListPage(params: object) {
+  return request({
+    url: `${prefix}/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 更新现场
+export function updateScene(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新增现场
+export function addScene(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除现场
+export function delScene(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 现场详情
+export function getSceneDetail(id: string) {
+  return request({
+    url: `${prefix}/detail?projectId=${id}`,
+    method: 'get',
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..ebaac07 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -156,13 +156,18 @@
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
+// 清除单选选中
+const clearRadio = () => {
+  console.log('清理单选选中')
+  singleChecked.value = ''
+}
 // 清除多选选中
 const clearMulti = () => {
-  console.log('清理选中')
+  console.log('清理选多选中')
   table.value!.clearSelection()
 }
 defineExpose({
-  clearMulti, initColumnsState,
+  clearMulti, initColumnsState, clearRadio,
 })
 onBeforeMount(() => {
   initColumnsState()
diff --git a/src/router/modules/scene.ts b/src/router/modules/scene.ts
index 5e24ee8..9f8388b 100644
--- a/src/router/modules/scene.ts
+++ b/src/router/modules/scene.ts
@@ -38,6 +38,30 @@
           activeMenu: '/scene',
         },
       },
+      {
+        path: 'scenedetail',
+        name: 'scenedetail',
+        component: () => import('@/views/scene/sceneDetail.vue'),
+        meta: {
+          title: '现场详情',
+          auth: '/scene',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/scene',
+        },
+      },
+      {
+        path: 'scenereport',
+        name: 'scenereport',
+        component: () => import('@/views/scene/sceneReport.vue'),
+        meta: {
+          title: '现场报告',
+          auth: '/scene',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/scene',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/device/deviceEdit.vue b/src/views/device/deviceEdit.vue
index 63d1474..2f6e4af 100644
--- a/src/views/device/deviceEdit.vue
+++ b/src/views/device/deviceEdit.vue
@@ -126,20 +126,27 @@
       btnLoading.value = true
       addDevice(deviceForm.value).then((response) => {
         if (response.code === 200) {
-          ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
-            confirmButtonText: '是',
-            cancelButtonText: '否',
-            type: 'info',
-          }).then(() => { // 选是
-            resetForm()
-            btnLoading.value = false
-            nextTick(() => {
-              dataFormRef.value.clearValidate()
-            })
-          }).catch(() => { // 选否,关闭窗口，并刷新页面
-            emits('watchChild')
-            dialogFormVisible.value = false
+          ElMessage({
+            message: '新增成功',
+            type: 'success',
           })
+          dataFormRef.value.clearValidate()
+          emits('watchChild')
+          dialogFormVisible.value = false
+          // ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
+          //   confirmButtonText: '是',
+          //   cancelButtonText: '否',
+          //   type: 'info',
+          // }).then(() => { // 选是
+          //   resetForm()
+          //   btnLoading.value = false
+          //   nextTick(() => {
+          //     dataFormRef.value.clearValidate()
+          //   })
+          // }).catch(() => { // 选否,关闭窗口，并刷新页面
+          //   emits('watchChild')
+          //   dialogFormVisible.value = false
+          // })
         }
       }).catch((_) => { // 异常情况，loading置为false
         btnLoading.value = false
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index 0fcc508..55f30e6 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -17,7 +17,7 @@
   deviceCode: '',
   deviceType: '',
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 const columns = ref<TableColumn[]>([
   {
diff --git a/src/views/person/index.vue b/src/views/person/index.vue
index f36b253..7448f74 100644
--- a/src/views/person/index.vue
+++ b/src/views/person/index.vue
@@ -82,6 +82,7 @@
 // 人脸注册
 const register = (row: any) => {
   // personRef.value.initDialog('update', {})
+  $router.push({ path: '/person/personedit', query: { type: 'update', row: JSON.stringify(row) } })
 }
 // 编辑人员
 const edit = (row: any) => {
@@ -192,7 +193,7 @@
           <template #columns>
             <el-table-column label="人脸注册" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" :disabled="scope.row.workerAvatar" size="small" @click="register(scope.row)">
+                <el-button link type="primary" :disabled="Boolean(scope.row.workerAvatar)" size="small" @click="register(scope.row)">
                   注册
                 </el-button>
               </template>
diff --git a/src/views/scene/components/deviceListDialog.vue b/src/views/scene/components/deviceListDialog.vue
index 2733e3a..115ba21 100644
--- a/src/views/scene/components/deviceListDialog.vue
+++ b/src/views/scene/components/deviceListDialog.vue
@@ -22,14 +22,14 @@
 const listQuery = ref({
   deviceCode: '',
   deviceType: '',
-  deviceStatus: '0',
+  projectId: '',
+  status: '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[]>([
@@ -44,7 +44,6 @@
 ])
 // 获取设备数据列表
 const fetchData = () => {
-  select.value = -1
   getDeviceListPage(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -87,7 +86,6 @@
   listQuery.value.limit = 5
   search()
   selectList.value = []
-  select.value = -1
 }
 
 // 点击保存
@@ -105,9 +103,9 @@
   }
   else {
     // 单选
-    if (select.value >= 0) {
-      const person = list.value.filter((item, index) => index == select.value)[0]
-      emits('add', Object.assign(person, { Type: deviceType.value }))
+    if (selectList.value.length > 0) {
+      const device = selectList.value[0]
+      emits('add', Object.assign(device, { Type: deviceType.value }))
       dialogFormVisible.value = false
       reset()
     }
@@ -121,8 +119,15 @@
   dialogFormVisible.value = false
   reset()
 }
+const tableRef = ref()
 // 初始化
-const initDialog = (type: string) => {
+const initDialog = (type: string, id: string) => {
+  // 清空选中状态
+  selectList.value = []
+  tableRef.value?.clearRadio()
+  tableRef.value?.clearMulti()
+  listQuery.value.projectId = id
+  // 设备类型
   deviceType.value = type
   let typeName = ''
   dialogFormVisible.value = true
@@ -142,6 +147,7 @@
     // 安全手环
     typeName = '安全树'
   }
+  // 设备类型参数
   const devicetype = deviceTypeList.value.filter(item => item.name === typeName)[0].value
   listQuery.value.deviceType = devicetype
   fetchData()
@@ -159,15 +165,15 @@
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
-      <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+      <normal-table ref="tableRef" :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">
+          <!-- <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> -->
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
diff --git a/src/views/scene/components/personTable.vue b/src/views/scene/components/personTable.vue
index 35e82c3..8896f85 100644
--- a/src/views/scene/components/personTable.vue
+++ b/src/views/scene/components/personTable.vue
@@ -9,8 +9,22 @@
 import deviceList from './deviceListDialog.vue'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
-
+const props = defineProps({
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const $route = useRoute()
 const userListData = ref<any[]>([])
+watch(() => props.list, (newVal) => {
+  if (newVal.length) {
+    userListData.value = JSON.parse(JSON.stringify(newVal))
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 // 表格被选中的行
 const selectList = ref<any[]>([])
 // 表格多选
@@ -40,8 +54,12 @@
 }
 // 选择设备
 const selectDevice = (index: number, type: string) => {
+  let id = ''
+  if ($route.query.id as string) {
+    id = $route.query.id as string
+  }
   personIndex.value = index
-  selectDeviceRef.value.initDialog(type)
+  selectDeviceRef.value.initDialog(type, id)
 }
 // 选中的作业人员
 const confirmPerson = (row: any) => {
@@ -49,6 +67,8 @@
   person.workerName = row.workerName
   person.phoneNumber = row.phoneNumber
   person.deptId = row.deptId
+  person.workerDeptName = row.deptName
+  person.workerId = row.id
 }
 // 选中的设备
 const confirmDevice = (row: any) => {
@@ -61,17 +81,20 @@
   userListData.value.push({
     edit: true,
     workerName: '',
-    phoneNumber: '',
+    workerPhoneNumber: '',
     deptId: '',
+    workerDeptName: '',
     braceletCode: '', // 手环编号
     hatCode: '', // 安全帽编号
     vastCode: '', // 背心编号
-    id: '', // 人员id
+    workerId: '', // 人员id
   })
 }
 // 删除人员
 const del = () => {
-
+  userListData.value = userListData.value.filter((item) => {
+    return !selectList.value.includes(item)
+  })
 }
 // 编辑人员
 const edit = (index: number) => {
@@ -85,6 +108,7 @@
   }
   userListData.value[index].edit = false
 }
+defineExpose({ userListData })
 </script>
 
 <template>
@@ -110,16 +134,15 @@
         </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>
+            <!-- <el-input v-if="scope.row.edit" v-model.trim="scope.row.phoneNumber" placeholder="联系方式" /> -->
+            <div style="height:32px;line-height: 32px;">{{ scope.row.workerPhoneNumber }}</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>
+            <!-- <dept-select v-if="scope.row.edit" v-model="scope.row.deptId" :data="deptTreeList" placeholder="所属部门"
+              style="width: 100%;" /> -->
+            <div style="height:32px;line-height: 32px;"> {{ scope.row.workerDeptName }} </div>
           </template>
         </el-table-column>
         <el-table-column label="挂载安全帽编号" align="center">
@@ -133,14 +156,14 @@
           <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>
+            <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>
+            <div v-else style="height:32px;line-height: 32px;">{{ scope.row.braceletCode }}</div>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center">
@@ -171,4 +194,5 @@
     margin-bottom: 0 !important;
   }
 
-}</style>
+}
+</style>
diff --git a/src/views/scene/index.vue b/src/views/scene/index.vue
index 26f3014..9b3b4fa 100644
--- a/src/views/scene/index.vue
+++ b/src/views/scene/index.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="ListLog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { getSceneListPage, delScene } from '@/api/scene'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
@@ -18,136 +19,62 @@
 const columns = ref([
   {
     text: '作业名称',
-    value: '1',
+    value: 'workTitle',
     align: 'center',
     // width: 170,
   },
   {
     text: '所属道路',
-    value: '2',
+    value: 'workRoad',
     align: 'center',
     // width: 100,
   },
   {
     text: '作业简介',
-    value: '3',
+    value: 'workSiteDesc',
     align: 'center',
   },
   {
     text: '负责人',
-    value: '4',
+    value: 'workPersonName',
     align: 'center',
   },
   {
     text: '负责人联系方式',
-    value: '5',
+    value: 'workPersonPhoneNumber',
     align: 'center',
   },
   {
     text: '注册时间',
-    value: '6',
+    value: 'registerTime',
     align: 'center',
   },
   {
     text: '当前状态',
-    value: '7',
+    value: 'projectStateName',
     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:'xxxxxx',
-      4:'张三',
-      5:'1370000000',
-      6:'2020-02-02',
-      7:'进行中'
-    },
-    {
-      1:'作业二',
-      2:'长安路',
-      3:'xxxxx',
-      4:'李四',
-      5:'1572000000',
-      6:'2023-04-01',
-      7:'已完成'
-    },
-    {
-      1:'作业三',
-      2:'学院路',
-      3:'xxxx',
-      4:'王五',
-      5:'183123123123',
-      6:'2021-01-01',
-      7:'未开始'
-    },
-  ]
-  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()
-    //   }
-    // })
+  getSceneListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
   })
 }
+fetchData()
 
 // 查询数据
 const search = () => {
   fetchData()
 }
 
-// 获取日志类型
-// const fetchLogType = () => {
-//   getLogType().then((response) => {
-//     logTypeList.value = response.data
-//   })
-// }
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
   if (val && val.size) {
@@ -170,7 +97,15 @@
 }
 // 编辑
 const edit = (row: any) => {
-  // editRef.value.initDialog('update', row)
+  $router.push({ path: '/scene/sceneedit', query: { id: row.id } })
+}
+// 详情
+const detail = (row: any) => {
+  $router.push({ path: '/scene/scenedetail', query: { id: row.id } })
+}
+// 报告
+const report = (row: any) => {
+  $router.push({ path: '/scene/scenereport', query: { id: row.id } })
 }
 // 删除
 const del = () => {
@@ -182,12 +117,13 @@
     }).then((res) => {
       // 点击确认
       const ids = selectList.value.map(item => item.id)
-      // delDevice(ids).then((res) => {
-      //   if (res.code === 200) {
-      //     selectList.value = []
-      //     fetchData()
-      //   }
-      // })
+      delScene(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
     }).catch(() => {
       // 点击取消
       selectList.value = []
@@ -206,11 +142,7 @@
       <!-- 筛选条件 -->
       <search-area @search="search">
         <search-item>
-          <el-input
-            v-model.trim="listQuery.beginTime"
-            placeholder="作业名称"
-            clearable
-          />
+          <el-input v-model.trim="listQuery.beginTime" placeholder="作业名称" clearable />
         </search-item>
         <search-item>
           <el-select v-model="listQuery.beginTime" clearable placeholder="所属街道">
@@ -218,27 +150,15 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.beginTime"
-            placeholder="责任人"
-            clearable
-          />
+          <el-input v-model.trim="listQuery.beginTime" placeholder="责任人" clearable />
         </search-item>
         <search-item>
-          <el-date-picker
-            v-model="listQuery.beginTime"
-            type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
-            placeholder="注册开始时间"
-          />
+          <el-date-picker v-model="listQuery.beginTime" 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"
-            placeholder="注册结束时间"
-          />
+          <el-date-picker v-model="listQuery.endTime" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
+            placeholder="注册结束时间" />
         </search-item>
         <search-item>
           <el-select v-model="listQuery.beginTime" clearable placeholder="当前状态">
@@ -246,39 +166,22 @@
           </el-select>
         </search-item>
         <template #btns>
-          <el-button
-            class="search-btn"
-            type="primary"
-            @click="add"
-          >
+          <el-button class="search-btn" type="primary" @click="add">
             新增
           </el-button>
-          <el-button
-            class="search-btn"
-            type="info"
-            @click="del"
-          >
+          <el-button class="search-btn" type="info" @click="del">
             删除
           </el-button>
         </template>
       </search-area>
       <table-container>
         <!-- 查询结果Table显示 -->
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :is-showmulti-select="true"
-          :is-multi="true"
-          :list-loading="listLoading"
-          @change="changePage"
-          @multi-select="multiSelect"
-        >
+        <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :is-showmulti-select="true"
+          :is-multi="true" :list-loading="listLoading" @change="changePage" @multi-select="multiSelect">
           <template #columns>
             <el-table-column label="编辑" width="70" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="detail(scope.row)">
+                <el-button link type="primary" size="small" @click="edit(scope.row)">
                   编辑
                 </el-button>
               </template>
@@ -292,7 +195,7 @@
             </el-table-column>
             <el-table-column label="作业报告" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="detail(scope.row)">
+                <el-button link type="primary" size="small" @click="report(scope.row)">
                   作业报告
                 </el-button>
               </template>
diff --git a/src/views/scene/sceneDetail.vue b/src/views/scene/sceneDetail.vue
new file mode 100644
index 0000000..e4909f8
--- /dev/null
+++ b/src/views/scene/sceneDetail.vue
@@ -0,0 +1,13 @@
+<!--
+  Description: 现场管理详情
+  Author: 李亚光
+  Date: 2023-05-04
+ -->
+<script lang="ts" setup name="sceneEdit">
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    现场管理详情
+  </app-container>
+</template>
diff --git a/src/views/scene/sceneEdit.vue b/src/views/scene/sceneEdit.vue
index 5b797ff..f895195 100644
--- a/src/views/scene/sceneEdit.vue
+++ b/src/views/scene/sceneEdit.vue
@@ -9,6 +9,7 @@
 import addOperatives from './components/personTable.vue'
 import personList from './components/personListDialog.vue'
 import deviceList from './components/deviceListDialog.vue'
+import { addScene, getSceneDetail, updateScene } from '@/api/scene'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -20,7 +21,7 @@
   workPersonName: '',
   workPersonPhoneNumber: '', // 负责人联系方式
   deviceList: [], // 	安全树列表
-  workerList: '', // 人员列表
+  workerList: [], // 人员列表
 }) // 表单
 const title = ref('')
 const rules = ref({
@@ -41,23 +42,31 @@
 const selectWorker = (row: any) => {
   ruleForm.value.workPerson = row.id
   ruleForm.value.workPersonName = row.workerName
-  ruleFormRef.value.clearValidate('workPersonName')
+  ruleFormRef.value?.clearValidate('workPersonName')
 }
 const selectDeviceRef = ref()
 // 选择安全树设备
 const seletDevice = () => {
-  selectDeviceRef.value.initDialog('SafetyTree')
+  let id = ''
+  if ($route.query.id as string) {
+    id = $route.query.id as string
+  }
+  selectDeviceRef.value.initDialog('SafetyTree', id)
 }
+const safetyTree = ref()
 // 确定安全树设备
 const confirmDevice = (list: any) => {
+  ruleForm.value.deviceList = []
+  safetyTree.value = list
   list.forEach((device: any) => {
     ruleForm.value.deviceList.push(device.deviceCode)
   })
+  ruleFormRef.value?.clearValidate('deviceList')
 }
+const personListRef = ref()
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
-  // 当前选中的证书基本信息列表
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
@@ -69,6 +78,38 @@
           type: 'warning',
         },
       ).then(() => {
+        // 判断作业人员
+        if (personListRef.value.userListData.length) {
+          //  人员必须绑定安全设备
+          if (personListRef.value.userListData.every((item: any) => item.braceletCode && item.hatCode && item.vastCode)) {
+            ruleForm.value.deviceList = safetyTree.value.map((item: any) => ({ deviceId: item.id ? item.id : item.deviceId }))
+            ruleForm.value.workerList = personListRef.value.userListData.map((item: any) => ({ workerId: item.workerId, braceletCode: item.braceletCode, hatCode: item.hatCode, vastCode: item.vastCode }))
+            // 新增编辑
+            const id = $route.query.id as string
+            if (id) {
+              updateScene(ruleForm.value).then((res) => {
+                if (res.code === 200) {
+                  ElMessage.success('修改成功')
+                  $router.go(-1)
+                }
+              })
+            }
+            else {
+              addScene(ruleForm.value).then((res) => {
+                if (res.code === 200) {
+                  ElMessage.success('新增成功')
+                  $router.go(-1)
+                }
+              })
+            }
+          }
+          else {
+            ElMessage.warning('所有作业人员需绑定安全设备')
+          }
+        }
+        else {
+          ElMessage.warning('请先添加作业人员')
+        }
       })
     }
   })
@@ -77,6 +118,24 @@
 const resetForm = () => {
   $router.go(-1)
 }
+const userList = ref()
+onMounted(() => {
+  const id = $route.query.id as string
+  title.value = '新增'
+  if (id) {
+    title.value = '编辑'
+    // 获取详情
+    getSceneDetail(id).then((res) => {
+      ruleForm.value = res.data
+      // 展示安全树
+      ruleForm.value.deviceList = res.data.deviceList.map((item: any) => item.deviceCode)
+      // 备份安全树
+      safetyTree.value = res.data.deviceList
+      // 备份人员列表
+      userList.value = res.data.workerList
+    })
+  }
+})
 </script>
 
 <template>
@@ -84,8 +143,8 @@
     <!-- 选择负责人弹窗 -->
     <person-list ref="selectPersonRef" @add="selectWorker" />
     <!-- 选择安全树设备弹窗 -->
-    <device-list ref="selectDeviceRef" @add="confirmDevice" :multiple="true" />
-    <detail-page title="作业现场新增">
+    <device-list ref="selectDeviceRef" :multiple="true" @add="confirmDevice" />
+    <detail-page :title="`作业现场${title}`">
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px"
         :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24">
@@ -121,13 +180,13 @@
           <el-col :span="24">
             <el-form-item label="" label-width="0px">
               <!-- 添加工作人员 -->
-              <add-operatives style="width:100%" />
+              <add-operatives ref="personListRef" style="width:100%" :list="userList" />
             </el-form-item>
           </el-col>
         </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 type="primary" @click="submitForm(ruleFormRef)">

diff --git a/src/api/scene.ts b/src/api/scene.ts
new file mode 100644
index 0000000..0956614
--- /dev/null
+++ b/src/api/scene.ts
@@ -0,0 +1,45 @@
+/**
+ * 现场管理接口
+ */
+import request from './index'
+const prefix = 'site'
+
+// 现场列表
+export function getSceneListPage(params: object) {
+  return request({
+    url: `${prefix}/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 更新现场
+export function updateScene(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新增现场
+export function addScene(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除现场
+export function delScene(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 现场详情
+export function getSceneDetail(id: string) {
+  return request({
+    url: `${prefix}/detail?projectId=${id}`,
+    method: 'get',
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..ebaac07 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -156,13 +156,18 @@
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
+// 清除单选选中
+const clearRadio = () => {
+  console.log('清理单选选中')
+  singleChecked.value = ''
+}
 // 清除多选选中
 const clearMulti = () => {
-  console.log('清理选中')
+  console.log('清理选多选中')
   table.value!.clearSelection()
 }
 defineExpose({
-  clearMulti, initColumnsState,
+  clearMulti, initColumnsState, clearRadio,
 })
 onBeforeMount(() => {
   initColumnsState()
diff --git a/src/router/modules/scene.ts b/src/router/modules/scene.ts
index 5e24ee8..9f8388b 100644
--- a/src/router/modules/scene.ts
+++ b/src/router/modules/scene.ts
@@ -38,6 +38,30 @@
           activeMenu: '/scene',
         },
       },
+      {
+        path: 'scenedetail',
+        name: 'scenedetail',
+        component: () => import('@/views/scene/sceneDetail.vue'),
+        meta: {
+          title: '现场详情',
+          auth: '/scene',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/scene',
+        },
+      },
+      {
+        path: 'scenereport',
+        name: 'scenereport',
+        component: () => import('@/views/scene/sceneReport.vue'),
+        meta: {
+          title: '现场报告',
+          auth: '/scene',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/scene',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/device/deviceEdit.vue b/src/views/device/deviceEdit.vue
index 63d1474..2f6e4af 100644
--- a/src/views/device/deviceEdit.vue
+++ b/src/views/device/deviceEdit.vue
@@ -126,20 +126,27 @@
       btnLoading.value = true
       addDevice(deviceForm.value).then((response) => {
         if (response.code === 200) {
-          ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
-            confirmButtonText: '是',
-            cancelButtonText: '否',
-            type: 'info',
-          }).then(() => { // 选是
-            resetForm()
-            btnLoading.value = false
-            nextTick(() => {
-              dataFormRef.value.clearValidate()
-            })
-          }).catch(() => { // 选否,关闭窗口，并刷新页面
-            emits('watchChild')
-            dialogFormVisible.value = false
+          ElMessage({
+            message: '新增成功',
+            type: 'success',
           })
+          dataFormRef.value.clearValidate()
+          emits('watchChild')
+          dialogFormVisible.value = false
+          // ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
+          //   confirmButtonText: '是',
+          //   cancelButtonText: '否',
+          //   type: 'info',
+          // }).then(() => { // 选是
+          //   resetForm()
+          //   btnLoading.value = false
+          //   nextTick(() => {
+          //     dataFormRef.value.clearValidate()
+          //   })
+          // }).catch(() => { // 选否,关闭窗口，并刷新页面
+          //   emits('watchChild')
+          //   dialogFormVisible.value = false
+          // })
         }
       }).catch((_) => { // 异常情况，loading置为false
         btnLoading.value = false
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index 0fcc508..55f30e6 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -17,7 +17,7 @@
   deviceCode: '',
   deviceType: '',
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 const columns = ref<TableColumn[]>([
   {
diff --git a/src/views/person/index.vue b/src/views/person/index.vue
index f36b253..7448f74 100644
--- a/src/views/person/index.vue
+++ b/src/views/person/index.vue
@@ -82,6 +82,7 @@
 // 人脸注册
 const register = (row: any) => {
   // personRef.value.initDialog('update', {})
+  $router.push({ path: '/person/personedit', query: { type: 'update', row: JSON.stringify(row) } })
 }
 // 编辑人员
 const edit = (row: any) => {
@@ -192,7 +193,7 @@
           <template #columns>
             <el-table-column label="人脸注册" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" :disabled="scope.row.workerAvatar" size="small" @click="register(scope.row)">
+                <el-button link type="primary" :disabled="Boolean(scope.row.workerAvatar)" size="small" @click="register(scope.row)">
                   注册
                 </el-button>
               </template>
diff --git a/src/views/scene/components/deviceListDialog.vue b/src/views/scene/components/deviceListDialog.vue
index 2733e3a..115ba21 100644
--- a/src/views/scene/components/deviceListDialog.vue
+++ b/src/views/scene/components/deviceListDialog.vue
@@ -22,14 +22,14 @@
 const listQuery = ref({
   deviceCode: '',
   deviceType: '',
-  deviceStatus: '0',
+  projectId: '',
+  status: '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[]>([
@@ -44,7 +44,6 @@
 ])
 // 获取设备数据列表
 const fetchData = () => {
-  select.value = -1
   getDeviceListPage(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -87,7 +86,6 @@
   listQuery.value.limit = 5
   search()
   selectList.value = []
-  select.value = -1
 }
 
 // 点击保存
@@ -105,9 +103,9 @@
   }
   else {
     // 单选
-    if (select.value >= 0) {
-      const person = list.value.filter((item, index) => index == select.value)[0]
-      emits('add', Object.assign(person, { Type: deviceType.value }))
+    if (selectList.value.length > 0) {
+      const device = selectList.value[0]
+      emits('add', Object.assign(device, { Type: deviceType.value }))
       dialogFormVisible.value = false
       reset()
     }
@@ -121,8 +119,15 @@
   dialogFormVisible.value = false
   reset()
 }
+const tableRef = ref()
 // 初始化
-const initDialog = (type: string) => {
+const initDialog = (type: string, id: string) => {
+  // 清空选中状态
+  selectList.value = []
+  tableRef.value?.clearRadio()
+  tableRef.value?.clearMulti()
+  listQuery.value.projectId = id
+  // 设备类型
   deviceType.value = type
   let typeName = ''
   dialogFormVisible.value = true
@@ -142,6 +147,7 @@
     // 安全手环
     typeName = '安全树'
   }
+  // 设备类型参数
   const devicetype = deviceTypeList.value.filter(item => item.name === typeName)[0].value
   listQuery.value.deviceType = devicetype
   fetchData()
@@ -159,15 +165,15 @@
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
-      <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+      <normal-table ref="tableRef" :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">
+          <!-- <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> -->
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
diff --git a/src/views/scene/components/personTable.vue b/src/views/scene/components/personTable.vue
index 35e82c3..8896f85 100644
--- a/src/views/scene/components/personTable.vue
+++ b/src/views/scene/components/personTable.vue
@@ -9,8 +9,22 @@
 import deviceList from './deviceListDialog.vue'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
-
+const props = defineProps({
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const $route = useRoute()
 const userListData = ref<any[]>([])
+watch(() => props.list, (newVal) => {
+  if (newVal.length) {
+    userListData.value = JSON.parse(JSON.stringify(newVal))
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 // 表格被选中的行
 const selectList = ref<any[]>([])
 // 表格多选
@@ -40,8 +54,12 @@
 }
 // 选择设备
 const selectDevice = (index: number, type: string) => {
+  let id = ''
+  if ($route.query.id as string) {
+    id = $route.query.id as string
+  }
   personIndex.value = index
-  selectDeviceRef.value.initDialog(type)
+  selectDeviceRef.value.initDialog(type, id)
 }
 // 选中的作业人员
 const confirmPerson = (row: any) => {
@@ -49,6 +67,8 @@
   person.workerName = row.workerName
   person.phoneNumber = row.phoneNumber
   person.deptId = row.deptId
+  person.workerDeptName = row.deptName
+  person.workerId = row.id
 }
 // 选中的设备
 const confirmDevice = (row: any) => {
@@ -61,17 +81,20 @@
   userListData.value.push({
     edit: true,
     workerName: '',
-    phoneNumber: '',
+    workerPhoneNumber: '',
     deptId: '',
+    workerDeptName: '',
     braceletCode: '', // 手环编号
     hatCode: '', // 安全帽编号
     vastCode: '', // 背心编号
-    id: '', // 人员id
+    workerId: '', // 人员id
   })
 }
 // 删除人员
 const del = () => {
-
+  userListData.value = userListData.value.filter((item) => {
+    return !selectList.value.includes(item)
+  })
 }
 // 编辑人员
 const edit = (index: number) => {
@@ -85,6 +108,7 @@
   }
   userListData.value[index].edit = false
 }
+defineExpose({ userListData })
 </script>
 
 <template>
@@ -110,16 +134,15 @@
         </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>
+            <!-- <el-input v-if="scope.row.edit" v-model.trim="scope.row.phoneNumber" placeholder="联系方式" /> -->
+            <div style="height:32px;line-height: 32px;">{{ scope.row.workerPhoneNumber }}</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>
+            <!-- <dept-select v-if="scope.row.edit" v-model="scope.row.deptId" :data="deptTreeList" placeholder="所属部门"
+              style="width: 100%;" /> -->
+            <div style="height:32px;line-height: 32px;"> {{ scope.row.workerDeptName }} </div>
           </template>
         </el-table-column>
         <el-table-column label="挂载安全帽编号" align="center">
@@ -133,14 +156,14 @@
           <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>
+            <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>
+            <div v-else style="height:32px;line-height: 32px;">{{ scope.row.braceletCode }}</div>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center">
@@ -171,4 +194,5 @@
     margin-bottom: 0 !important;
   }
 
-}</style>
+}
+</style>
diff --git a/src/views/scene/index.vue b/src/views/scene/index.vue
index 26f3014..9b3b4fa 100644
--- a/src/views/scene/index.vue
+++ b/src/views/scene/index.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="ListLog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { getSceneListPage, delScene } from '@/api/scene'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
@@ -18,136 +19,62 @@
 const columns = ref([
   {
     text: '作业名称',
-    value: '1',
+    value: 'workTitle',
     align: 'center',
     // width: 170,
   },
   {
     text: '所属道路',
-    value: '2',
+    value: 'workRoad',
     align: 'center',
     // width: 100,
   },
   {
     text: '作业简介',
-    value: '3',
+    value: 'workSiteDesc',
     align: 'center',
   },
   {
     text: '负责人',
-    value: '4',
+    value: 'workPersonName',
     align: 'center',
   },
   {
     text: '负责人联系方式',
-    value: '5',
+    value: 'workPersonPhoneNumber',
     align: 'center',
   },
   {
     text: '注册时间',
-    value: '6',
+    value: 'registerTime',
     align: 'center',
   },
   {
     text: '当前状态',
-    value: '7',
+    value: 'projectStateName',
     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:'xxxxxx',
-      4:'张三',
-      5:'1370000000',
-      6:'2020-02-02',
-      7:'进行中'
-    },
-    {
-      1:'作业二',
-      2:'长安路',
-      3:'xxxxx',
-      4:'李四',
-      5:'1572000000',
-      6:'2023-04-01',
-      7:'已完成'
-    },
-    {
-      1:'作业三',
-      2:'学院路',
-      3:'xxxx',
-      4:'王五',
-      5:'183123123123',
-      6:'2021-01-01',
-      7:'未开始'
-    },
-  ]
-  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()
-    //   }
-    // })
+  getSceneListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
   })
 }
+fetchData()
 
 // 查询数据
 const search = () => {
   fetchData()
 }
 
-// 获取日志类型
-// const fetchLogType = () => {
-//   getLogType().then((response) => {
-//     logTypeList.value = response.data
-//   })
-// }
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
   if (val && val.size) {
@@ -170,7 +97,15 @@
 }
 // 编辑
 const edit = (row: any) => {
-  // editRef.value.initDialog('update', row)
+  $router.push({ path: '/scene/sceneedit', query: { id: row.id } })
+}
+// 详情
+const detail = (row: any) => {
+  $router.push({ path: '/scene/scenedetail', query: { id: row.id } })
+}
+// 报告
+const report = (row: any) => {
+  $router.push({ path: '/scene/scenereport', query: { id: row.id } })
 }
 // 删除
 const del = () => {
@@ -182,12 +117,13 @@
     }).then((res) => {
       // 点击确认
       const ids = selectList.value.map(item => item.id)
-      // delDevice(ids).then((res) => {
-      //   if (res.code === 200) {
-      //     selectList.value = []
-      //     fetchData()
-      //   }
-      // })
+      delScene(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
     }).catch(() => {
       // 点击取消
       selectList.value = []
@@ -206,11 +142,7 @@
       <!-- 筛选条件 -->
       <search-area @search="search">
         <search-item>
-          <el-input
-            v-model.trim="listQuery.beginTime"
-            placeholder="作业名称"
-            clearable
-          />
+          <el-input v-model.trim="listQuery.beginTime" placeholder="作业名称" clearable />
         </search-item>
         <search-item>
           <el-select v-model="listQuery.beginTime" clearable placeholder="所属街道">
@@ -218,27 +150,15 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.beginTime"
-            placeholder="责任人"
-            clearable
-          />
+          <el-input v-model.trim="listQuery.beginTime" placeholder="责任人" clearable />
         </search-item>
         <search-item>
-          <el-date-picker
-            v-model="listQuery.beginTime"
-            type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
-            placeholder="注册开始时间"
-          />
+          <el-date-picker v-model="listQuery.beginTime" 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"
-            placeholder="注册结束时间"
-          />
+          <el-date-picker v-model="listQuery.endTime" type="datetime" value-format="YYYY/MM/DD HH:mm:ss"
+            placeholder="注册结束时间" />
         </search-item>
         <search-item>
           <el-select v-model="listQuery.beginTime" clearable placeholder="当前状态">
@@ -246,39 +166,22 @@
           </el-select>
         </search-item>
         <template #btns>
-          <el-button
-            class="search-btn"
-            type="primary"
-            @click="add"
-          >
+          <el-button class="search-btn" type="primary" @click="add">
             新增
           </el-button>
-          <el-button
-            class="search-btn"
-            type="info"
-            @click="del"
-          >
+          <el-button class="search-btn" type="info" @click="del">
             删除
           </el-button>
         </template>
       </search-area>
       <table-container>
         <!-- 查询结果Table显示 -->
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :is-showmulti-select="true"
-          :is-multi="true"
-          :list-loading="listLoading"
-          @change="changePage"
-          @multi-select="multiSelect"
-        >
+        <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :is-showmulti-select="true"
+          :is-multi="true" :list-loading="listLoading" @change="changePage" @multi-select="multiSelect">
           <template #columns>
             <el-table-column label="编辑" width="70" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="detail(scope.row)">
+                <el-button link type="primary" size="small" @click="edit(scope.row)">
                   编辑
                 </el-button>
               </template>
@@ -292,7 +195,7 @@
             </el-table-column>
             <el-table-column label="作业报告" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="detail(scope.row)">
+                <el-button link type="primary" size="small" @click="report(scope.row)">
                   作业报告
                 </el-button>
               </template>
diff --git a/src/views/scene/sceneDetail.vue b/src/views/scene/sceneDetail.vue
new file mode 100644
index 0000000..e4909f8
--- /dev/null
+++ b/src/views/scene/sceneDetail.vue
@@ -0,0 +1,13 @@
+<!--
+  Description: 现场管理详情
+  Author: 李亚光
+  Date: 2023-05-04
+ -->
+<script lang="ts" setup name="sceneEdit">
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    现场管理详情
+  </app-container>
+</template>
diff --git a/src/views/scene/sceneEdit.vue b/src/views/scene/sceneEdit.vue
index 5b797ff..f895195 100644
--- a/src/views/scene/sceneEdit.vue
+++ b/src/views/scene/sceneEdit.vue
@@ -9,6 +9,7 @@
 import addOperatives from './components/personTable.vue'
 import personList from './components/personListDialog.vue'
 import deviceList from './components/deviceListDialog.vue'
+import { addScene, getSceneDetail, updateScene } from '@/api/scene'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -20,7 +21,7 @@
   workPersonName: '',
   workPersonPhoneNumber: '', // 负责人联系方式
   deviceList: [], // 	安全树列表
-  workerList: '', // 人员列表
+  workerList: [], // 人员列表
 }) // 表单
 const title = ref('')
 const rules = ref({
@@ -41,23 +42,31 @@
 const selectWorker = (row: any) => {
   ruleForm.value.workPerson = row.id
   ruleForm.value.workPersonName = row.workerName
-  ruleFormRef.value.clearValidate('workPersonName')
+  ruleFormRef.value?.clearValidate('workPersonName')
 }
 const selectDeviceRef = ref()
 // 选择安全树设备
 const seletDevice = () => {
-  selectDeviceRef.value.initDialog('SafetyTree')
+  let id = ''
+  if ($route.query.id as string) {
+    id = $route.query.id as string
+  }
+  selectDeviceRef.value.initDialog('SafetyTree', id)
 }
+const safetyTree = ref()
 // 确定安全树设备
 const confirmDevice = (list: any) => {
+  ruleForm.value.deviceList = []
+  safetyTree.value = list
   list.forEach((device: any) => {
     ruleForm.value.deviceList.push(device.deviceCode)
   })
+  ruleFormRef.value?.clearValidate('deviceList')
 }
+const personListRef = ref()
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
-  // 当前选中的证书基本信息列表
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
@@ -69,6 +78,38 @@
           type: 'warning',
         },
       ).then(() => {
+        // 判断作业人员
+        if (personListRef.value.userListData.length) {
+          //  人员必须绑定安全设备
+          if (personListRef.value.userListData.every((item: any) => item.braceletCode && item.hatCode && item.vastCode)) {
+            ruleForm.value.deviceList = safetyTree.value.map((item: any) => ({ deviceId: item.id ? item.id : item.deviceId }))
+            ruleForm.value.workerList = personListRef.value.userListData.map((item: any) => ({ workerId: item.workerId, braceletCode: item.braceletCode, hatCode: item.hatCode, vastCode: item.vastCode }))
+            // 新增编辑
+            const id = $route.query.id as string
+            if (id) {
+              updateScene(ruleForm.value).then((res) => {
+                if (res.code === 200) {
+                  ElMessage.success('修改成功')
+                  $router.go(-1)
+                }
+              })
+            }
+            else {
+              addScene(ruleForm.value).then((res) => {
+                if (res.code === 200) {
+                  ElMessage.success('新增成功')
+                  $router.go(-1)
+                }
+              })
+            }
+          }
+          else {
+            ElMessage.warning('所有作业人员需绑定安全设备')
+          }
+        }
+        else {
+          ElMessage.warning('请先添加作业人员')
+        }
       })
     }
   })
@@ -77,6 +118,24 @@
 const resetForm = () => {
   $router.go(-1)
 }
+const userList = ref()
+onMounted(() => {
+  const id = $route.query.id as string
+  title.value = '新增'
+  if (id) {
+    title.value = '编辑'
+    // 获取详情
+    getSceneDetail(id).then((res) => {
+      ruleForm.value = res.data
+      // 展示安全树
+      ruleForm.value.deviceList = res.data.deviceList.map((item: any) => item.deviceCode)
+      // 备份安全树
+      safetyTree.value = res.data.deviceList
+      // 备份人员列表
+      userList.value = res.data.workerList
+    })
+  }
+})
 </script>
 
 <template>
@@ -84,8 +143,8 @@
     <!-- 选择负责人弹窗 -->
     <person-list ref="selectPersonRef" @add="selectWorker" />
     <!-- 选择安全树设备弹窗 -->
-    <device-list ref="selectDeviceRef" @add="confirmDevice" :multiple="true" />
-    <detail-page title="作业现场新增">
+    <device-list ref="selectDeviceRef" :multiple="true" @add="confirmDevice" />
+    <detail-page :title="`作业现场${title}`">
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px"
         :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24">
@@ -121,13 +180,13 @@
           <el-col :span="24">
             <el-form-item label="" label-width="0px">
               <!-- 添加工作人员 -->
-              <add-operatives style="width:100%" />
+              <add-operatives ref="personListRef" style="width:100%" :list="userList" />
             </el-form-item>
           </el-col>
         </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 type="primary" @click="submitForm(ruleFormRef)">
diff --git a/src/views/scene/sceneReport.vue b/src/views/scene/sceneReport.vue
new file mode 100644
index 0000000..f55b88a
--- /dev/null
+++ b/src/views/scene/sceneReport.vue
@@ -0,0 +1,13 @@
+<!--
+  Description: 现场管理报告
+  Author: 李亚光
+  Date: 2023-05-04
+ -->
+<script lang="ts" setup name="sceneEdit">
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    现场管理报告
+  </app-container>
+</template>