diff --git a/public/config/config.json b/public/config/config.json
index a85fc42..29161c3 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -10,5 +10,5 @@
   "maxZoom": "13",
   "zoom": "10",
   "timeGap": 3000,
-  "systemType": "sm"
+  "systemType": "gm"
 }

diff --git a/public/config/config.json b/public/config/config.json
index a85fc42..29161c3 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -10,5 +10,5 @@
   "maxZoom": "13",
   "zoom": "10",
   "timeGap": 3000,
-  "systemType": "sm"
+  "systemType": "gm"
 }
diff --git a/src/api/alarm/dangerAssessment/manage.ts b/src/api/alarm/dangerAssessment/manage.ts
new file mode 100644
index 0000000..dae1056
--- /dev/null
+++ b/src/api/alarm/dangerAssessment/manage.ts
@@ -0,0 +1,50 @@
+/**
+ * 安全生产隐患管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getDangerAssessmentManageList(data: any) {
+  return request({
+    url: 'risk/listPage',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 详情
+export function getDangerAssessmentManageDetail(data: { id: string }) {
+  return request({
+    url: 'risk/detail',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 新增
+export function addDangerAssessmentManage(data: object) {
+  return request({
+    url: 'risk/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateDangerAssessmentManage(data: object) {
+  return request({
+    url: 'risk/update',
+    method: 'post',
+    data,
+  })
+}
+
+// 批量导入
+export function batchImport(data: object) {
+  return request({
+    url: 'risk/batchImport',
+    method: 'post',
+    data,
+  })
+}
+

diff --git a/public/config/config.json b/public/config/config.json
index a85fc42..29161c3 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -10,5 +10,5 @@
   "maxZoom": "13",
   "zoom": "10",
   "timeGap": 3000,
-  "systemType": "sm"
+  "systemType": "gm"
 }
diff --git a/src/api/alarm/dangerAssessment/manage.ts b/src/api/alarm/dangerAssessment/manage.ts
new file mode 100644
index 0000000..dae1056
--- /dev/null
+++ b/src/api/alarm/dangerAssessment/manage.ts
@@ -0,0 +1,50 @@
+/**
+ * 安全生产隐患管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getDangerAssessmentManageList(data: any) {
+  return request({
+    url: 'risk/listPage',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 详情
+export function getDangerAssessmentManageDetail(data: { id: string }) {
+  return request({
+    url: 'risk/detail',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 新增
+export function addDangerAssessmentManage(data: object) {
+  return request({
+    url: 'risk/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateDangerAssessmentManage(data: object) {
+  return request({
+    url: 'risk/update',
+    method: 'post',
+    data,
+  })
+}
+
+// 批量导入
+export function batchImport(data: object) {
+  return request({
+    url: 'risk/batchImport',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/alarm/policyConfig/monitorPoint.ts b/src/api/alarm/policyConfig/monitorPoint.ts
new file mode 100644
index 0000000..e4cd648
--- /dev/null
+++ b/src/api/alarm/policyConfig/monitorPoint.ts
@@ -0,0 +1,68 @@
+/**
+ * 监控点位管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getMonitorPointList(data: any) {
+  return request({
+    url: 'device/relation/listPage',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 详情
+export function getMonitorPointDetail(data: { id: string }) {
+  return request({
+    url: 'device/relation/detail',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 编辑
+export function updateMonitorPoint(data: object) {
+  return request({
+    url: 'device/relation/update',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取盒子列表
+export function getBoxList(data: any) {
+  return request({
+    url: 'device/box/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 获取算法列表
+export function getModelList(data: any) {
+  return request({
+    url: 'device/model/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 获取算法-场景对象列表
+export function getSceneList(data: any) {
+  return request({
+    url: 'scene/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 算法报警对象
+export function getRecognitionList(data: any) {
+  return request({
+    url: 'device/recognitionType/recognitionList',
+    method: 'get',
+    params: data,
+  })
+}
+

diff --git a/public/config/config.json b/public/config/config.json
index a85fc42..29161c3 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -10,5 +10,5 @@
   "maxZoom": "13",
   "zoom": "10",
   "timeGap": 3000,
-  "systemType": "sm"
+  "systemType": "gm"
 }
diff --git a/src/api/alarm/dangerAssessment/manage.ts b/src/api/alarm/dangerAssessment/manage.ts
new file mode 100644
index 0000000..dae1056
--- /dev/null
+++ b/src/api/alarm/dangerAssessment/manage.ts
@@ -0,0 +1,50 @@
+/**
+ * 安全生产隐患管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getDangerAssessmentManageList(data: any) {
+  return request({
+    url: 'risk/listPage',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 详情
+export function getDangerAssessmentManageDetail(data: { id: string }) {
+  return request({
+    url: 'risk/detail',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 新增
+export function addDangerAssessmentManage(data: object) {
+  return request({
+    url: 'risk/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateDangerAssessmentManage(data: object) {
+  return request({
+    url: 'risk/update',
+    method: 'post',
+    data,
+  })
+}
+
+// 批量导入
+export function batchImport(data: object) {
+  return request({
+    url: 'risk/batchImport',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/alarm/policyConfig/monitorPoint.ts b/src/api/alarm/policyConfig/monitorPoint.ts
new file mode 100644
index 0000000..e4cd648
--- /dev/null
+++ b/src/api/alarm/policyConfig/monitorPoint.ts
@@ -0,0 +1,68 @@
+/**
+ * 监控点位管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getMonitorPointList(data: any) {
+  return request({
+    url: 'device/relation/listPage',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 详情
+export function getMonitorPointDetail(data: { id: string }) {
+  return request({
+    url: 'device/relation/detail',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 编辑
+export function updateMonitorPoint(data: object) {
+  return request({
+    url: 'device/relation/update',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取盒子列表
+export function getBoxList(data: any) {
+  return request({
+    url: 'device/box/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 获取算法列表
+export function getModelList(data: any) {
+  return request({
+    url: 'device/model/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 获取算法-场景对象列表
+export function getSceneList(data: any) {
+  return request({
+    url: 'scene/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 算法报警对象
+export function getRecognitionList(data: any) {
+  return request({
+    url: 'device/recognitionType/recognitionList',
+    method: 'get',
+    params: data,
+  })
+}
+
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 04b39cc..92165e1 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -40,7 +40,7 @@
     default: 'default',
   }, // 输入框大小
 })
-const emit = defineEmits(['update:modelValue'])
+const emit = defineEmits(['update:modelValue', 'changeDept'])
 // ------------定义props参数----------
 const value = computed({
   get() {
@@ -153,6 +153,10 @@
     return []
   }
 }
+
+const changeDept = (val: any) => {
+  emit('changeDept', val)
+}
 // --------暴露方法
 defineExpose({ refreshTree, fetchDeptTree, findChildren })
 </script>
@@ -176,6 +180,7 @@
       filterable
       class="full-width-input"
       :disabled="props.disabled"
+      @change="changeDept"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />

diff --git a/public/config/config.json b/public/config/config.json
index a85fc42..29161c3 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -10,5 +10,5 @@
   "maxZoom": "13",
   "zoom": "10",
   "timeGap": 3000,
-  "systemType": "sm"
+  "systemType": "gm"
 }
diff --git a/src/api/alarm/dangerAssessment/manage.ts b/src/api/alarm/dangerAssessment/manage.ts
new file mode 100644
index 0000000..dae1056
--- /dev/null
+++ b/src/api/alarm/dangerAssessment/manage.ts
@@ -0,0 +1,50 @@
+/**
+ * 安全生产隐患管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getDangerAssessmentManageList(data: any) {
+  return request({
+    url: 'risk/listPage',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 详情
+export function getDangerAssessmentManageDetail(data: { id: string }) {
+  return request({
+    url: 'risk/detail',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 新增
+export function addDangerAssessmentManage(data: object) {
+  return request({
+    url: 'risk/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateDangerAssessmentManage(data: object) {
+  return request({
+    url: 'risk/update',
+    method: 'post',
+    data,
+  })
+}
+
+// 批量导入
+export function batchImport(data: object) {
+  return request({
+    url: 'risk/batchImport',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/alarm/policyConfig/monitorPoint.ts b/src/api/alarm/policyConfig/monitorPoint.ts
new file mode 100644
index 0000000..e4cd648
--- /dev/null
+++ b/src/api/alarm/policyConfig/monitorPoint.ts
@@ -0,0 +1,68 @@
+/**
+ * 监控点位管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getMonitorPointList(data: any) {
+  return request({
+    url: 'device/relation/listPage',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 详情
+export function getMonitorPointDetail(data: { id: string }) {
+  return request({
+    url: 'device/relation/detail',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 编辑
+export function updateMonitorPoint(data: object) {
+  return request({
+    url: 'device/relation/update',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取盒子列表
+export function getBoxList(data: any) {
+  return request({
+    url: 'device/box/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 获取算法列表
+export function getModelList(data: any) {
+  return request({
+    url: 'device/model/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 获取算法-场景对象列表
+export function getSceneList(data: any) {
+  return request({
+    url: 'scene/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 算法报警对象
+export function getRecognitionList(data: any) {
+  return request({
+    url: 'device/recognitionType/recognitionList',
+    method: 'get',
+    params: data,
+  })
+}
+
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 04b39cc..92165e1 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -40,7 +40,7 @@
     default: 'default',
   }, // 输入框大小
 })
-const emit = defineEmits(['update:modelValue'])
+const emit = defineEmits(['update:modelValue', 'changeDept'])
 // ------------定义props参数----------
 const value = computed({
   get() {
@@ -153,6 +153,10 @@
     return []
   }
 }
+
+const changeDept = (val: any) => {
+  emit('changeDept', val)
+}
 // --------暴露方法
 defineExpose({ refreshTree, fetchDeptTree, findChildren })
 </script>
@@ -176,6 +180,7 @@
       filterable
       class="full-width-input"
       :disabled="props.disabled"
+      @change="changeDept"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index d1f5b24..e3d6460 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -8,5 +8,6 @@
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
   fixed?: boolean // 固定列
+  required?: boolean // 是否必填
 }
 

diff --git a/public/config/config.json b/public/config/config.json
index a85fc42..29161c3 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -10,5 +10,5 @@
   "maxZoom": "13",
   "zoom": "10",
   "timeGap": 3000,
-  "systemType": "sm"
+  "systemType": "gm"
 }
diff --git a/src/api/alarm/dangerAssessment/manage.ts b/src/api/alarm/dangerAssessment/manage.ts
new file mode 100644
index 0000000..dae1056
--- /dev/null
+++ b/src/api/alarm/dangerAssessment/manage.ts
@@ -0,0 +1,50 @@
+/**
+ * 安全生产隐患管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getDangerAssessmentManageList(data: any) {
+  return request({
+    url: 'risk/listPage',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 详情
+export function getDangerAssessmentManageDetail(data: { id: string }) {
+  return request({
+    url: 'risk/detail',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 新增
+export function addDangerAssessmentManage(data: object) {
+  return request({
+    url: 'risk/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateDangerAssessmentManage(data: object) {
+  return request({
+    url: 'risk/update',
+    method: 'post',
+    data,
+  })
+}
+
+// 批量导入
+export function batchImport(data: object) {
+  return request({
+    url: 'risk/batchImport',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/alarm/policyConfig/monitorPoint.ts b/src/api/alarm/policyConfig/monitorPoint.ts
new file mode 100644
index 0000000..e4cd648
--- /dev/null
+++ b/src/api/alarm/policyConfig/monitorPoint.ts
@@ -0,0 +1,68 @@
+/**
+ * 监控点位管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getMonitorPointList(data: any) {
+  return request({
+    url: 'device/relation/listPage',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 详情
+export function getMonitorPointDetail(data: { id: string }) {
+  return request({
+    url: 'device/relation/detail',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 编辑
+export function updateMonitorPoint(data: object) {
+  return request({
+    url: 'device/relation/update',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取盒子列表
+export function getBoxList(data: any) {
+  return request({
+    url: 'device/box/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 获取算法列表
+export function getModelList(data: any) {
+  return request({
+    url: 'device/model/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 获取算法-场景对象列表
+export function getSceneList(data: any) {
+  return request({
+    url: 'scene/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 算法报警对象
+export function getRecognitionList(data: any) {
+  return request({
+    url: 'device/recognitionType/recognitionList',
+    method: 'get',
+    params: data,
+  })
+}
+
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 04b39cc..92165e1 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -40,7 +40,7 @@
     default: 'default',
   }, // 输入框大小
 })
-const emit = defineEmits(['update:modelValue'])
+const emit = defineEmits(['update:modelValue', 'changeDept'])
 // ------------定义props参数----------
 const value = computed({
   get() {
@@ -153,6 +153,10 @@
     return []
   }
 }
+
+const changeDept = (val: any) => {
+  emit('changeDept', val)
+}
 // --------暴露方法
 defineExpose({ refreshTree, fetchDeptTree, findChildren })
 </script>
@@ -176,6 +180,7 @@
       filterable
       class="full-width-input"
       :disabled="props.disabled"
+      @change="changeDept"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index d1f5b24..e3d6460 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -8,5 +8,6 @@
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
   fixed?: boolean // 固定列
+  required?: boolean // 是否必填
 }
 
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
index 31a16b9..fb5f8ac 100644
--- a/src/utils/useCheckList.ts
+++ b/src/utils/useCheckList.ts
@@ -1,5 +1,4 @@
 import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 
 /**
  * 检查列表
@@ -7,13 +6,14 @@
  * @param columns // 表头信息
  * @param tableTitle // 表格名称
  */
-export function useCheckList(list: { [key: string]: string }[], columns: TableColumn, tableTitle = '') {
+export function useCheckList(list: { [key: string]: string }[], columns: any, tableTitle = '') {
   for (let index = 0; index < list.length; index++) {
     const item = list[index]
     for (const prop of columns) {
       // 检查必填
       if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        // ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        ElMessage.warning(`请先完善${tableTitle}中【${item.typeName}】的${prop.text}`)
         return false
       }
       // 验证正则

diff --git a/public/config/config.json b/public/config/config.json
index a85fc42..29161c3 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -10,5 +10,5 @@
   "maxZoom": "13",
   "zoom": "10",
   "timeGap": 3000,
-  "systemType": "sm"
+  "systemType": "gm"
 }
diff --git a/src/api/alarm/dangerAssessment/manage.ts b/src/api/alarm/dangerAssessment/manage.ts
new file mode 100644
index 0000000..dae1056
--- /dev/null
+++ b/src/api/alarm/dangerAssessment/manage.ts
@@ -0,0 +1,50 @@
+/**
+ * 安全生产隐患管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getDangerAssessmentManageList(data: any) {
+  return request({
+    url: 'risk/listPage',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 详情
+export function getDangerAssessmentManageDetail(data: { id: string }) {
+  return request({
+    url: 'risk/detail',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 新增
+export function addDangerAssessmentManage(data: object) {
+  return request({
+    url: 'risk/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateDangerAssessmentManage(data: object) {
+  return request({
+    url: 'risk/update',
+    method: 'post',
+    data,
+  })
+}
+
+// 批量导入
+export function batchImport(data: object) {
+  return request({
+    url: 'risk/batchImport',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/alarm/policyConfig/monitorPoint.ts b/src/api/alarm/policyConfig/monitorPoint.ts
new file mode 100644
index 0000000..e4cd648
--- /dev/null
+++ b/src/api/alarm/policyConfig/monitorPoint.ts
@@ -0,0 +1,68 @@
+/**
+ * 监控点位管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getMonitorPointList(data: any) {
+  return request({
+    url: 'device/relation/listPage',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 详情
+export function getMonitorPointDetail(data: { id: string }) {
+  return request({
+    url: 'device/relation/detail',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 编辑
+export function updateMonitorPoint(data: object) {
+  return request({
+    url: 'device/relation/update',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取盒子列表
+export function getBoxList(data: any) {
+  return request({
+    url: 'device/box/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 获取算法列表
+export function getModelList(data: any) {
+  return request({
+    url: 'device/model/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 获取算法-场景对象列表
+export function getSceneList(data: any) {
+  return request({
+    url: 'scene/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 算法报警对象
+export function getRecognitionList(data: any) {
+  return request({
+    url: 'device/recognitionType/recognitionList',
+    method: 'get',
+    params: data,
+  })
+}
+
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 04b39cc..92165e1 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -40,7 +40,7 @@
     default: 'default',
   }, // 输入框大小
 })
-const emit = defineEmits(['update:modelValue'])
+const emit = defineEmits(['update:modelValue', 'changeDept'])
 // ------------定义props参数----------
 const value = computed({
   get() {
@@ -153,6 +153,10 @@
     return []
   }
 }
+
+const changeDept = (val: any) => {
+  emit('changeDept', val)
+}
 // --------暴露方法
 defineExpose({ refreshTree, fetchDeptTree, findChildren })
 </script>
@@ -176,6 +180,7 @@
       filterable
       class="full-width-input"
       :disabled="props.disabled"
+      @change="changeDept"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index d1f5b24..e3d6460 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -8,5 +8,6 @@
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
   fixed?: boolean // 固定列
+  required?: boolean // 是否必填
 }
 
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
index 31a16b9..fb5f8ac 100644
--- a/src/utils/useCheckList.ts
+++ b/src/utils/useCheckList.ts
@@ -1,5 +1,4 @@
 import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 
 /**
  * 检查列表
@@ -7,13 +6,14 @@
  * @param columns // 表头信息
  * @param tableTitle // 表格名称
  */
-export function useCheckList(list: { [key: string]: string }[], columns: TableColumn, tableTitle = '') {
+export function useCheckList(list: { [key: string]: string }[], columns: any, tableTitle = '') {
   for (let index = 0; index < list.length; index++) {
     const item = list[index]
     for (const prop of columns) {
       // 检查必填
       if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        // ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        ElMessage.warning(`请先完善${tableTitle}中【${item.typeName}】的${prop.text}`)
         return false
       }
       // 验证正则
diff --git a/src/views/alarm/dangerAssessment/manage/editPointDialog.vue b/src/views/alarm/dangerAssessment/manage/editPointDialog.vue
new file mode 100644
index 0000000..db4b29f
--- /dev/null
+++ b/src/views/alarm/dangerAssessment/manage/editPointDialog.vue
@@ -0,0 +1,219 @@
+<!-- 新增、编辑危险点 -->
+<script lang="ts" setup name="EditPointDialog">
+import { reactive, ref } from 'vue'
+import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { addDangerAssessmentManage, updateDangerAssessmentManage } from '@/api/alarm/dangerAssessment/manage'
+const emits = defineEmits(['closeRefresh'])
+const dialogStatus = ref('add')
+const dialogVisible = ref(false) // 弹窗显示隐藏
+// 显示标题
+const textMap: { [key: string]: string } = {
+  detail: '详情',
+  edit: '编辑',
+  add: '新增',
+}
+
+// 表单数据对象
+const formData = ref({
+  id: '',
+  deptId: '', // 所属单位id
+  deptName: '', // 所属单位
+  riskName: '', // 危险点名称
+  address: '', // 详细地址
+  content: '', // 作业活动概述
+  nature: '', // 危险性质
+  grade: '', // 等级
+  assignPost: '', // 定岗
+  staffQuota: 1, // 定员
+  substancesQuantities: '', // 危险物质及定量
+})
+const btnLoading = ref(false) // 保存按钮加载状态
+const formDataRef = ref<FormInstance>() // 表单对象
+// 校验规则
+const rules = reactive<FormRules>({
+  deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
+  riskName: [{ required: true, message: '危险点名称必填', trigger: ['blur', 'change'] }],
+  address: [{ required: true, message: '详细地址必填', trigger: ['blur', 'change'] }],
+  content: [{ required: true, message: '作业活动概述必填', trigger: ['blur', 'change'] }],
+  nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
+  grade: [{ required: true, message: '等级必填', trigger: ['blur', 'change'] }],
+  assignPost: [{ required: true, message: '定岗必填', trigger: ['blur', 'change'] }],
+  staffQuota: [{ required: true, message: '定员必填', trigger: ['blur', 'change'] }],
+  substancesQuantities: [{ required: true, message: '危险物质及定量必填', trigger: ['blur', 'change'] }],
+})
+
+// -----------------------------------------字典--------------------------------------------------------------
+const deviceStatusList = ref<dictType[]>([]) // 危险点等级
+const getDict = async () => {
+  // 危险点等级
+  getDictByCode('dangerPointGrade').then((response) => {
+    deviceStatusList.value = response.data
+  })
+}
+getDict()
+// -------------------------------------------------------------------------------------------
+// 表单提交
+function submitForm() {
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.warning('新增危险点成功')
+            return false
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.warning('编辑危险点成功')
+            return false
+          })
+        }
+      }
+    })
+  }
+}
+
+// 重置表单
+function resetForm() {
+  formData.value = {
+    id: '',
+    deptId: '', // 所属单位id
+    deptName: '', // 所属单位
+    riskName: '', // 危险点名称
+    address: '', // 详细地址
+    content: '', // 作业活动概述
+    nature: '', // 危险性质
+    grade: '', // 等级
+    assignPost: '', // 定岗
+    staffQuota: 1, // 定员
+    substancesQuantities: '', // 危险物质及定量
+  }
+}
+
+// -----------------------------------初始化、关闭对话框相关-----------------------------------------
+function initDialog(dialogstatus: string, row: any) {
+  dialogVisible.value = true
+  if (dialogstatus === 'edit' || dialogstatus === 'detail') {
+    formData.value.id = row.id
+    formData.value.deptId = row.deptId // 所属单位id
+    formData.value.deptName = row.deptName // 所属单位
+    formData.value.riskName = row.riskName // 危险点名称
+    formData.value.address = row.address // 详细地址
+    formData.value.content = row.content // 作业活动概述
+    formData.value.nature = row.nature // 危险性质
+    formData.value.grade = row.grade // 等级
+    formData.value.assignPost = row.assignPost // 定岗
+    formData.value.staffQuota = Number(row.staffQuota) // 定员
+    formData.value.substancesQuantities = row.substancesQuantities // 危险物质及定量
+  }
+
+  // 详情隐藏表单校验
+  if (dialogstatus === 'detail') {
+    formDataRef.value?.clearValidate()
+  }
+  dialogStatus.value = dialogstatus // 类型 新建add 编辑edit 详情detail
+  btnLoading.value = false
+}
+
+// 关闭并刷新
+function closeRefresh() {
+  dialogVisible.value = false
+  resetForm()
+  emits('closeRefresh')
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible" :title="textMap[dialogStatus]" width="800" :before-close="closeRefresh" append-to-body
+    :open-delay="0" :close-on-click-modal="false"
+  >
+    <el-form
+      ref="formDataRef" :model="formData" :rules="rules" label-position="right" label-width="130px"
+      class="form-container" size="default" :disabled="dialogStatus === 'detail'" @submit.prevent
+    >
+      <el-row :gutter="10">
+        <el-col :span="12">
+          <el-form-item label="所属单位" prop="deptId">
+            <dept-select v-model="formData.deptId" placeholder="必选" :disabled="dialogStatus === 'detail'" :dept-show="true" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="危险源名称" prop="riskName">
+            <el-input :value="formData.riskName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="详细地址" prop="address">
+            <el-input :value="formData.address" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="作业活动概述" prop="content">
+            <el-input :value="formData.content" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="危险性质" prop="nature">
+            <el-input :value="formData.nature" :disabled="dialogStatus === 'detail'" type="text" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="等级" prop="grade">
+            <el-select
+              v-model="formData.grade"
+              placeholder="必选"
+              clearable
+              filterable
+              :disabled="dialogStatus === 'detail'"
+            >
+              <el-option v-for="item of deviceStatusList" :key="item.id" :label="item.name" :value="item.name "/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="定岗" prop="assignPost">
+            <el-input :value="formData.assignPost" :disabled="dialogStatus === 'detail'" type="text" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="定员" prop="staffQuota">
+            <el-input-number
+              v-model="formData.staffQuota" class="full-width-input"
+              :min="1" :precision="0" :step="1" placeholder="必填"
+              :disabled="dialogStatus === 'detail'"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="危险物质及定量" prop="substancesQuantities">
+            <el-input :value="formData.substancesQuantities" :disabled="dialogStatus === 'detail'" type="text" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button v-if="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button @click="closeRefresh">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//
+</style>

diff --git a/public/config/config.json b/public/config/config.json
index a85fc42..29161c3 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -10,5 +10,5 @@
   "maxZoom": "13",
   "zoom": "10",
   "timeGap": 3000,
-  "systemType": "sm"
+  "systemType": "gm"
 }
diff --git a/src/api/alarm/dangerAssessment/manage.ts b/src/api/alarm/dangerAssessment/manage.ts
new file mode 100644
index 0000000..dae1056
--- /dev/null
+++ b/src/api/alarm/dangerAssessment/manage.ts
@@ -0,0 +1,50 @@
+/**
+ * 安全生产隐患管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getDangerAssessmentManageList(data: any) {
+  return request({
+    url: 'risk/listPage',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 详情
+export function getDangerAssessmentManageDetail(data: { id: string }) {
+  return request({
+    url: 'risk/detail',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 新增
+export function addDangerAssessmentManage(data: object) {
+  return request({
+    url: 'risk/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateDangerAssessmentManage(data: object) {
+  return request({
+    url: 'risk/update',
+    method: 'post',
+    data,
+  })
+}
+
+// 批量导入
+export function batchImport(data: object) {
+  return request({
+    url: 'risk/batchImport',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/alarm/policyConfig/monitorPoint.ts b/src/api/alarm/policyConfig/monitorPoint.ts
new file mode 100644
index 0000000..e4cd648
--- /dev/null
+++ b/src/api/alarm/policyConfig/monitorPoint.ts
@@ -0,0 +1,68 @@
+/**
+ * 监控点位管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getMonitorPointList(data: any) {
+  return request({
+    url: 'device/relation/listPage',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 详情
+export function getMonitorPointDetail(data: { id: string }) {
+  return request({
+    url: 'device/relation/detail',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 编辑
+export function updateMonitorPoint(data: object) {
+  return request({
+    url: 'device/relation/update',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取盒子列表
+export function getBoxList(data: any) {
+  return request({
+    url: 'device/box/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 获取算法列表
+export function getModelList(data: any) {
+  return request({
+    url: 'device/model/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 获取算法-场景对象列表
+export function getSceneList(data: any) {
+  return request({
+    url: 'scene/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 算法报警对象
+export function getRecognitionList(data: any) {
+  return request({
+    url: 'device/recognitionType/recognitionList',
+    method: 'get',
+    params: data,
+  })
+}
+
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 04b39cc..92165e1 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -40,7 +40,7 @@
     default: 'default',
   }, // 输入框大小
 })
-const emit = defineEmits(['update:modelValue'])
+const emit = defineEmits(['update:modelValue', 'changeDept'])
 // ------------定义props参数----------
 const value = computed({
   get() {
@@ -153,6 +153,10 @@
     return []
   }
 }
+
+const changeDept = (val: any) => {
+  emit('changeDept', val)
+}
 // --------暴露方法
 defineExpose({ refreshTree, fetchDeptTree, findChildren })
 </script>
@@ -176,6 +180,7 @@
       filterable
       class="full-width-input"
       :disabled="props.disabled"
+      @change="changeDept"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index d1f5b24..e3d6460 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -8,5 +8,6 @@
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
   fixed?: boolean // 固定列
+  required?: boolean // 是否必填
 }
 
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
index 31a16b9..fb5f8ac 100644
--- a/src/utils/useCheckList.ts
+++ b/src/utils/useCheckList.ts
@@ -1,5 +1,4 @@
 import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 
 /**
  * 检查列表
@@ -7,13 +6,14 @@
  * @param columns // 表头信息
  * @param tableTitle // 表格名称
  */
-export function useCheckList(list: { [key: string]: string }[], columns: TableColumn, tableTitle = '') {
+export function useCheckList(list: { [key: string]: string }[], columns: any, tableTitle = '') {
   for (let index = 0; index < list.length; index++) {
     const item = list[index]
     for (const prop of columns) {
       // 检查必填
       if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        // ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        ElMessage.warning(`请先完善${tableTitle}中【${item.typeName}】的${prop.text}`)
         return false
       }
       // 验证正则
diff --git a/src/views/alarm/dangerAssessment/manage/editPointDialog.vue b/src/views/alarm/dangerAssessment/manage/editPointDialog.vue
new file mode 100644
index 0000000..db4b29f
--- /dev/null
+++ b/src/views/alarm/dangerAssessment/manage/editPointDialog.vue
@@ -0,0 +1,219 @@
+<!-- 新增、编辑危险点 -->
+<script lang="ts" setup name="EditPointDialog">
+import { reactive, ref } from 'vue'
+import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { addDangerAssessmentManage, updateDangerAssessmentManage } from '@/api/alarm/dangerAssessment/manage'
+const emits = defineEmits(['closeRefresh'])
+const dialogStatus = ref('add')
+const dialogVisible = ref(false) // 弹窗显示隐藏
+// 显示标题
+const textMap: { [key: string]: string } = {
+  detail: '详情',
+  edit: '编辑',
+  add: '新增',
+}
+
+// 表单数据对象
+const formData = ref({
+  id: '',
+  deptId: '', // 所属单位id
+  deptName: '', // 所属单位
+  riskName: '', // 危险点名称
+  address: '', // 详细地址
+  content: '', // 作业活动概述
+  nature: '', // 危险性质
+  grade: '', // 等级
+  assignPost: '', // 定岗
+  staffQuota: 1, // 定员
+  substancesQuantities: '', // 危险物质及定量
+})
+const btnLoading = ref(false) // 保存按钮加载状态
+const formDataRef = ref<FormInstance>() // 表单对象
+// 校验规则
+const rules = reactive<FormRules>({
+  deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
+  riskName: [{ required: true, message: '危险点名称必填', trigger: ['blur', 'change'] }],
+  address: [{ required: true, message: '详细地址必填', trigger: ['blur', 'change'] }],
+  content: [{ required: true, message: '作业活动概述必填', trigger: ['blur', 'change'] }],
+  nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
+  grade: [{ required: true, message: '等级必填', trigger: ['blur', 'change'] }],
+  assignPost: [{ required: true, message: '定岗必填', trigger: ['blur', 'change'] }],
+  staffQuota: [{ required: true, message: '定员必填', trigger: ['blur', 'change'] }],
+  substancesQuantities: [{ required: true, message: '危险物质及定量必填', trigger: ['blur', 'change'] }],
+})
+
+// -----------------------------------------字典--------------------------------------------------------------
+const deviceStatusList = ref<dictType[]>([]) // 危险点等级
+const getDict = async () => {
+  // 危险点等级
+  getDictByCode('dangerPointGrade').then((response) => {
+    deviceStatusList.value = response.data
+  })
+}
+getDict()
+// -------------------------------------------------------------------------------------------
+// 表单提交
+function submitForm() {
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.warning('新增危险点成功')
+            return false
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.warning('编辑危险点成功')
+            return false
+          })
+        }
+      }
+    })
+  }
+}
+
+// 重置表单
+function resetForm() {
+  formData.value = {
+    id: '',
+    deptId: '', // 所属单位id
+    deptName: '', // 所属单位
+    riskName: '', // 危险点名称
+    address: '', // 详细地址
+    content: '', // 作业活动概述
+    nature: '', // 危险性质
+    grade: '', // 等级
+    assignPost: '', // 定岗
+    staffQuota: 1, // 定员
+    substancesQuantities: '', // 危险物质及定量
+  }
+}
+
+// -----------------------------------初始化、关闭对话框相关-----------------------------------------
+function initDialog(dialogstatus: string, row: any) {
+  dialogVisible.value = true
+  if (dialogstatus === 'edit' || dialogstatus === 'detail') {
+    formData.value.id = row.id
+    formData.value.deptId = row.deptId // 所属单位id
+    formData.value.deptName = row.deptName // 所属单位
+    formData.value.riskName = row.riskName // 危险点名称
+    formData.value.address = row.address // 详细地址
+    formData.value.content = row.content // 作业活动概述
+    formData.value.nature = row.nature // 危险性质
+    formData.value.grade = row.grade // 等级
+    formData.value.assignPost = row.assignPost // 定岗
+    formData.value.staffQuota = Number(row.staffQuota) // 定员
+    formData.value.substancesQuantities = row.substancesQuantities // 危险物质及定量
+  }
+
+  // 详情隐藏表单校验
+  if (dialogstatus === 'detail') {
+    formDataRef.value?.clearValidate()
+  }
+  dialogStatus.value = dialogstatus // 类型 新建add 编辑edit 详情detail
+  btnLoading.value = false
+}
+
+// 关闭并刷新
+function closeRefresh() {
+  dialogVisible.value = false
+  resetForm()
+  emits('closeRefresh')
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible" :title="textMap[dialogStatus]" width="800" :before-close="closeRefresh" append-to-body
+    :open-delay="0" :close-on-click-modal="false"
+  >
+    <el-form
+      ref="formDataRef" :model="formData" :rules="rules" label-position="right" label-width="130px"
+      class="form-container" size="default" :disabled="dialogStatus === 'detail'" @submit.prevent
+    >
+      <el-row :gutter="10">
+        <el-col :span="12">
+          <el-form-item label="所属单位" prop="deptId">
+            <dept-select v-model="formData.deptId" placeholder="必选" :disabled="dialogStatus === 'detail'" :dept-show="true" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="危险源名称" prop="riskName">
+            <el-input :value="formData.riskName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="详细地址" prop="address">
+            <el-input :value="formData.address" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="作业活动概述" prop="content">
+            <el-input :value="formData.content" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="危险性质" prop="nature">
+            <el-input :value="formData.nature" :disabled="dialogStatus === 'detail'" type="text" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="等级" prop="grade">
+            <el-select
+              v-model="formData.grade"
+              placeholder="必选"
+              clearable
+              filterable
+              :disabled="dialogStatus === 'detail'"
+            >
+              <el-option v-for="item of deviceStatusList" :key="item.id" :label="item.name" :value="item.name "/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="定岗" prop="assignPost">
+            <el-input :value="formData.assignPost" :disabled="dialogStatus === 'detail'" type="text" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="定员" prop="staffQuota">
+            <el-input-number
+              v-model="formData.staffQuota" class="full-width-input"
+              :min="1" :precision="0" :step="1" placeholder="必填"
+              :disabled="dialogStatus === 'detail'"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="危险物质及定量" prop="substancesQuantities">
+            <el-input :value="formData.substancesQuantities" :disabled="dialogStatus === 'detail'" type="text" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button v-if="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button @click="closeRefresh">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//
+</style>
diff --git a/src/views/alarm/dangerAssessment/manage/list.vue b/src/views/alarm/dangerAssessment/manage/list.vue
index a1b6214..3e27450 100644
--- a/src/views/alarm/dangerAssessment/manage/list.vue
+++ b/src/views/alarm/dangerAssessment/manage/list.vue
@@ -5,61 +5,112 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IList, IListQuery } from './manage-interface'
 // import EditDialog from './editDialog.vue'
+import editPointDialog from './editPointDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { uploadApi } from '@/api/monitor/dev'
 import { getDictByCode } from '@/api/system/dict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { dictType } from '@/global'
+import { getDangerAssessmentManageList } from '@/api/alarm/dangerAssessment/manage'
 const { proxy } = getCurrentInstance() as any
 const editDialogRef = ref() // 组件
 const router = useRouter()
 // 文件上传input
 const fileRef = ref()
 const loading = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// ------------------------------------------------------------------------------------------
 // 默认查询条件
 const listQuery: Ref<IListQuery> = ref({
   area: '', // 所属区域
-  deptId: '', // 所属区域
-  dangerCategory: '', // 隐患分类
-  startTime: '', // 开始时间
-  endTime: '', // 结束时间
+  deptId: '', // 所属组织
+  riskName: '', // 危险点名称
+  riskType: '', // 危险点类型
   offset: 1,
   limit: 20,
 })
-// 表格表头
-const columns: Ref<TableColumn[]> = ref([
-  { text: '所属区域', value: 'area', align: 'center' },
+// ------------------------------------------表头---------------------------------------------
+const columns: Ref<TableColumn[]> = ref([]) // 表头
+// 危险点
+const columnsPoint: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '业务内容', value: 'businessContent', align: 'center' },
-  { text: '隐患分类Ⅰ', value: 'yhfl1', align: 'center' },
-  { text: '隐患分类Ⅱ', value: 'yhfl2', align: 'center' },
-  { text: '监控相机', value: 'equipmentName', align: 'center' },
-  { text: '录入时间', value: 'time', align: 'center' },
-  { text: '备注', value: 'remark', align: 'center' },
-])
+  { text: '危险点名称', value: 'riskName', align: 'center' },
+  { text: '详细地址', value: 'address', align: 'center' },
+  { text: '作业活动概述', value: 'content', align: 'center' },
+  { text: '危险性质', value: 'nature', align: 'center' },
+  { text: '等级', value: 'grade', align: 'center' },
+  { text: '定岗', value: 'assignPost', align: 'center' },
+  { text: '定员', value: 'staffQuota', align: 'center' },
+  { text: '危险物质及定量', value: 'substancesQuantities', align: 'center' },
+]
+// 重大危险源
+const columnsSource: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险源名称', value: 'businessContent', align: 'center' },
+  { text: '场所级别', value: 'yhfl1', align: 'center' },
+  { text: '危险化学品名称', value: 'yhfl2', align: 'center' },
+  { text: '危险性质', value: 'equipmentName', align: 'center' },
+  { text: '存量', value: 'time', align: 'center' },
+  { text: '临界量', value: 'remark', align: 'center' },
+  { text: '分级指数', value: 'remark', align: 'center' },
+  { text: '危险物质及定量', value: 'remark', align: 'center' },
+  { text: '危险源等级', value: 'remark', align: 'center' },
+]
+// 危险化学品场所
+const columnsChemistry: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险化学品场所', value: 'businessContent', align: 'center' },
+  { text: '场所分类', value: 'yhfl1', align: 'center' },
+  { text: '作业活动', value: 'yhfl2', align: 'center' },
+  { text: '危化品名称', value: 'equipmentName', align: 'center' },
+  { text: '危险性质', value: 'time', align: 'center' },
+  { text: '定岗', value: 'remark', align: 'center' },
+  { text: '定员', value: 'remark', align: 'center' },
+  { text: '定量', value: 'remark', align: 'center' },
+  { text: '定寿命', value: 'remark', align: 'center' },
+  { text: '定检', value: 'remark', align: 'center' },
+]
+// 危险作业
+const columnsWork: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险作业', value: 'businessContent', align: 'center' },
+  { text: '危险作业等级', value: 'yhfl1', align: 'center' },
+  { text: '主要危险描述', value: 'yhfl2', align: 'center' },
+  { text: '相关部门', value: 'equipmentName', align: 'center' },
+  { text: '作业频次', value: 'time', align: 'center' },
+]
+// 危险作业工序
+const columnsWorkProcesses: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险作业工序', value: 'businessContent', align: 'center' },
+  { text: '作业人员数量', value: 'yhfl1', align: 'center' },
+  { text: '事故类型', value: 'yhfl2', align: 'center' },
+]
+// -------------------------------------------------------------------------------------------
 const total = ref(0) // 数据条数
-const list = ref<IList[]>([]) // 数据条数
-const checkoutList = ref<IList[]>([]) // 数据条数
-// 开始结束时间
-const datetimerange = ref()
-watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
-  if (Array.isArray(newVal)) {
-    if (newVal.length) {
-      listQuery.value.startTime = `${newVal[0]} 00:00:00`
-      listQuery.value.endTime = `${newVal[1]} 23:59:59`
+const list = ref([]) // 数据条数
+const checkoutList = ref([]) // 数据条数
+
+const editPointDialogRef = ref() // 危险点ref
+// -----------------------------------------字典--------------------------------------------------------------
+// 查询字典
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('dangerAssessmentType')
+  // 制作右上角的菜单
+  const tempMenu = ['重大危险源', '危险点', '危险化学品场所', '危险作业', '危险作业工序']
+  tempMenu.forEach((item) => {
+    const tempFindData = res.data.find((e: { name: string; value: string }) => e.name === item)
+    if (tempFindData) {
+      menu.value.push({
+        name: tempFindData.name,
+        id: `${tempFindData.value}`,
+      })
     }
-  }
-})
-// ------------------------------------字典------------------------------------------
-// const statusList = ref<dictType[]>([]) // 在线状态
-const getDict = () => {
-  // // 在线状态
-  // getDictByCode('status').then((response) => {
-  //   statusList.value = response.data
-  // })
+  })
 }
-getDict()
 // -----------------------------------文件上传-------------------------------------------
 // 点击批量导入
 const batchImport = () => {
@@ -101,34 +152,12 @@
 // 查询数据
 const fetchData = () => {
   loading.value = true
-  // getDevListPage(listQuery).then((res: { data: { rows: []; total: number } }) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loading.value = false
-  // })
-  list.value = [{
-    id: '1',
-    area: '测试数据1', // 设备名称
-    deptName: '测试数据1', // 设备编号
-    businessContent: '测试数据1', // 所属单位
-    yhfl1: '测试数据1', // RTSP地址
-    yhfl2: '测试数据1', // 识别间隔
-    equipmentName: '测试数据1', // 告警间隔
-    time: '2021-11-11',
-    remark: '测试数据1', // 业务场景
-  },
-  {
-    id: '2',
-    area: '测试数据2', // 设备名称
-    deptName: '测试数据2', // 设备编号
-    businessContent: '测试数据2', // 所属单位
-    yhfl1: '测试数据2', // RTSP地址
-    yhfl2: '测试数据2', // 识别间隔
-    equipmentName: '测试数据2', // 告警间隔
-    time: '2022-09-08',
-    remark: '测试数据2', // 业务场景
-  },
-  ]
+  listQuery.value.riskType = active.value // 危险点类型
+  getDangerAssessmentManageList(listQuery.value).then((res: { data: { rows: []; total: number } }) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    loading.value = false
+  })
   loading.value = false
 }
 
@@ -136,14 +165,12 @@
 const reset = () => {
   listQuery.value = {
     area: '', // 所属区域
-    deptId: '', // 所属区域
-    dangerCategory: '', // 隐患分类
-    startTime: '', // 开始时间
-    endTime: '', // 结束时间
+    deptId: '', // 所属组织
+    riskName: '', // 危险点名称
+    riskType: '', // 危险点类型
     offset: 1,
     limit: 20,
   }
-  datetimerange.value = []
   fetchData()
 }
 
@@ -154,17 +181,57 @@
 
 // 新增
 const add = (row: IList) => {
-  ElMessage.info('敬请期待')
+  switch (active.value) {
+    case '1': // 危险点
+      editPointDialogRef.value.initDialog('add')
+      break
+    case '2': // 重大危险源
+      break
+    case '3': // 危险化学品场所
+      break
+    case '4': // 危险作业
+      break
+    case '5': // 危险作业工序
+      break
+  }
   // editDialogRef.value.initDialog('add')
 }
 // 详情
 const detail = (row: IList) => {
-  editDialogRef.value.initDialog('detail', row)
+  switch (active.value) {
+    case '1': // 危险点
+      editPointDialogRef.value.initDialog('detail', row)
+      break
+    case '2': // 重大危险源
+      break
+    case '3': // 危险化学品场所
+      break
+    case '4': // 危险作业
+      break
+    case '5': // 危险作业工序
+      break
+  }
+}
+// 编辑
+const edit = (row: IList) => {
+  switch (active.value) {
+    case '1': // 危险点
+      editPointDialogRef.value.initDialog('edit', row)
+      break
+    case '2': // 重大危险源
+      break
+    case '3': // 危险化学品场所
+      break
+    case '4': // 危险作业
+      break
+    case '5': // 危险作业工序
+      break
+  }
 }
 // 删除
 const del = (row: IList) => {
   ElMessageBox.confirm(
-    `确定要删除${row.equipmentName}吗？`,
+    '确定删除吗？',
     '确认删除',
     {
       confirmButtonText: '确定',
@@ -191,7 +258,39 @@
   fetchData()
 }
 
-onMounted(() => {
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  reset()
+}
+
+watch(() => active.value, (newValue) => {
+  console.log(newValue)
+  switch (newValue) {
+    case '1': // 危险点
+      columns.value = columnsPoint
+      break
+    case '2': // 重大危险源
+      columns.value = columnsSource
+      break
+    case '3': // 危险化学品场所
+      columns.value = columnsChemistry
+      break
+    case '4': // 危险作业
+      columns.value = columnsWork
+      break
+    case '5': // 危险作业工序
+      columns.value = columnsWorkProcesses
+      break
+    default:
+      columns.value = columnsPoint
+      break
+  }
+}, { immediate: true })
+
+onMounted(async () => {
+  await getDict()
+  active.value = '1'
   fetchData()
 })
 </script>
@@ -200,19 +299,10 @@
   <app-container>
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.area" placeholder="所属区域" clearable style="width: 200px;" @change="search" />
+        <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search" @changeDept="search"/>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search" />
-      </search-item>
-      <search-item>
-        <el-input v-model="listQuery.dangerCategory" placeholder="隐患分类" clearable style="width: 200px;" @change="search" />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
-          range-separator="至" start-placeholder="录入时间(开始)" end-placeholder="录入时间(结束)" @change="search"
-        />
+        <el-input v-model="listQuery.riskName" placeholder="危险点名称" clearable style="width: 200px;" />
       </search-item>
     </search-area>
     <table-container>
@@ -222,12 +312,22 @@
       </template>
       <input v-show="false" ref="fileRef" type="file" accept="xlsx/*" @change="onFileChange">
       <normal-table :query="listQuery" :list-loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" width="120" align="center">
+          <el-table-column label="操作" width="150" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" class="table-text-button" @click="detail(scope.row)">
                 详情
               </el-button>
+              <el-button type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
+                编辑
+              </el-button>
               <el-button type="danger" link size="small" class="table-text-button" @click="del(scope.row)">
                 删除
               </el-button>
@@ -237,5 +337,9 @@
       </normal-table>
     </table-container>
     <edit-dialog ref="editDialogRef" @close-refresh="search" />
+    <!-- 编辑危险点 -->
+    <edit-point-dialog ref="editPointDialogRef" />
+    <!-- 右上角按钮集合 -->
+    <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
   </app-container>
 </template>

diff --git a/public/config/config.json b/public/config/config.json
index a85fc42..29161c3 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -10,5 +10,5 @@
   "maxZoom": "13",
   "zoom": "10",
   "timeGap": 3000,
-  "systemType": "sm"
+  "systemType": "gm"
 }
diff --git a/src/api/alarm/dangerAssessment/manage.ts b/src/api/alarm/dangerAssessment/manage.ts
new file mode 100644
index 0000000..dae1056
--- /dev/null
+++ b/src/api/alarm/dangerAssessment/manage.ts
@@ -0,0 +1,50 @@
+/**
+ * 安全生产隐患管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getDangerAssessmentManageList(data: any) {
+  return request({
+    url: 'risk/listPage',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 详情
+export function getDangerAssessmentManageDetail(data: { id: string }) {
+  return request({
+    url: 'risk/detail',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 新增
+export function addDangerAssessmentManage(data: object) {
+  return request({
+    url: 'risk/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateDangerAssessmentManage(data: object) {
+  return request({
+    url: 'risk/update',
+    method: 'post',
+    data,
+  })
+}
+
+// 批量导入
+export function batchImport(data: object) {
+  return request({
+    url: 'risk/batchImport',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/alarm/policyConfig/monitorPoint.ts b/src/api/alarm/policyConfig/monitorPoint.ts
new file mode 100644
index 0000000..e4cd648
--- /dev/null
+++ b/src/api/alarm/policyConfig/monitorPoint.ts
@@ -0,0 +1,68 @@
+/**
+ * 监控点位管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getMonitorPointList(data: any) {
+  return request({
+    url: 'device/relation/listPage',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 详情
+export function getMonitorPointDetail(data: { id: string }) {
+  return request({
+    url: 'device/relation/detail',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 编辑
+export function updateMonitorPoint(data: object) {
+  return request({
+    url: 'device/relation/update',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取盒子列表
+export function getBoxList(data: any) {
+  return request({
+    url: 'device/box/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 获取算法列表
+export function getModelList(data: any) {
+  return request({
+    url: 'device/model/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 获取算法-场景对象列表
+export function getSceneList(data: any) {
+  return request({
+    url: 'scene/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 算法报警对象
+export function getRecognitionList(data: any) {
+  return request({
+    url: 'device/recognitionType/recognitionList',
+    method: 'get',
+    params: data,
+  })
+}
+
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 04b39cc..92165e1 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -40,7 +40,7 @@
     default: 'default',
   }, // 输入框大小
 })
-const emit = defineEmits(['update:modelValue'])
+const emit = defineEmits(['update:modelValue', 'changeDept'])
 // ------------定义props参数----------
 const value = computed({
   get() {
@@ -153,6 +153,10 @@
     return []
   }
 }
+
+const changeDept = (val: any) => {
+  emit('changeDept', val)
+}
 // --------暴露方法
 defineExpose({ refreshTree, fetchDeptTree, findChildren })
 </script>
@@ -176,6 +180,7 @@
       filterable
       class="full-width-input"
       :disabled="props.disabled"
+      @change="changeDept"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index d1f5b24..e3d6460 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -8,5 +8,6 @@
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
   fixed?: boolean // 固定列
+  required?: boolean // 是否必填
 }
 
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
index 31a16b9..fb5f8ac 100644
--- a/src/utils/useCheckList.ts
+++ b/src/utils/useCheckList.ts
@@ -1,5 +1,4 @@
 import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 
 /**
  * 检查列表
@@ -7,13 +6,14 @@
  * @param columns // 表头信息
  * @param tableTitle // 表格名称
  */
-export function useCheckList(list: { [key: string]: string }[], columns: TableColumn, tableTitle = '') {
+export function useCheckList(list: { [key: string]: string }[], columns: any, tableTitle = '') {
   for (let index = 0; index < list.length; index++) {
     const item = list[index]
     for (const prop of columns) {
       // 检查必填
       if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        // ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        ElMessage.warning(`请先完善${tableTitle}中【${item.typeName}】的${prop.text}`)
         return false
       }
       // 验证正则
diff --git a/src/views/alarm/dangerAssessment/manage/editPointDialog.vue b/src/views/alarm/dangerAssessment/manage/editPointDialog.vue
new file mode 100644
index 0000000..db4b29f
--- /dev/null
+++ b/src/views/alarm/dangerAssessment/manage/editPointDialog.vue
@@ -0,0 +1,219 @@
+<!-- 新增、编辑危险点 -->
+<script lang="ts" setup name="EditPointDialog">
+import { reactive, ref } from 'vue'
+import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { addDangerAssessmentManage, updateDangerAssessmentManage } from '@/api/alarm/dangerAssessment/manage'
+const emits = defineEmits(['closeRefresh'])
+const dialogStatus = ref('add')
+const dialogVisible = ref(false) // 弹窗显示隐藏
+// 显示标题
+const textMap: { [key: string]: string } = {
+  detail: '详情',
+  edit: '编辑',
+  add: '新增',
+}
+
+// 表单数据对象
+const formData = ref({
+  id: '',
+  deptId: '', // 所属单位id
+  deptName: '', // 所属单位
+  riskName: '', // 危险点名称
+  address: '', // 详细地址
+  content: '', // 作业活动概述
+  nature: '', // 危险性质
+  grade: '', // 等级
+  assignPost: '', // 定岗
+  staffQuota: 1, // 定员
+  substancesQuantities: '', // 危险物质及定量
+})
+const btnLoading = ref(false) // 保存按钮加载状态
+const formDataRef = ref<FormInstance>() // 表单对象
+// 校验规则
+const rules = reactive<FormRules>({
+  deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
+  riskName: [{ required: true, message: '危险点名称必填', trigger: ['blur', 'change'] }],
+  address: [{ required: true, message: '详细地址必填', trigger: ['blur', 'change'] }],
+  content: [{ required: true, message: '作业活动概述必填', trigger: ['blur', 'change'] }],
+  nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
+  grade: [{ required: true, message: '等级必填', trigger: ['blur', 'change'] }],
+  assignPost: [{ required: true, message: '定岗必填', trigger: ['blur', 'change'] }],
+  staffQuota: [{ required: true, message: '定员必填', trigger: ['blur', 'change'] }],
+  substancesQuantities: [{ required: true, message: '危险物质及定量必填', trigger: ['blur', 'change'] }],
+})
+
+// -----------------------------------------字典--------------------------------------------------------------
+const deviceStatusList = ref<dictType[]>([]) // 危险点等级
+const getDict = async () => {
+  // 危险点等级
+  getDictByCode('dangerPointGrade').then((response) => {
+    deviceStatusList.value = response.data
+  })
+}
+getDict()
+// -------------------------------------------------------------------------------------------
+// 表单提交
+function submitForm() {
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.warning('新增危险点成功')
+            return false
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.warning('编辑危险点成功')
+            return false
+          })
+        }
+      }
+    })
+  }
+}
+
+// 重置表单
+function resetForm() {
+  formData.value = {
+    id: '',
+    deptId: '', // 所属单位id
+    deptName: '', // 所属单位
+    riskName: '', // 危险点名称
+    address: '', // 详细地址
+    content: '', // 作业活动概述
+    nature: '', // 危险性质
+    grade: '', // 等级
+    assignPost: '', // 定岗
+    staffQuota: 1, // 定员
+    substancesQuantities: '', // 危险物质及定量
+  }
+}
+
+// -----------------------------------初始化、关闭对话框相关-----------------------------------------
+function initDialog(dialogstatus: string, row: any) {
+  dialogVisible.value = true
+  if (dialogstatus === 'edit' || dialogstatus === 'detail') {
+    formData.value.id = row.id
+    formData.value.deptId = row.deptId // 所属单位id
+    formData.value.deptName = row.deptName // 所属单位
+    formData.value.riskName = row.riskName // 危险点名称
+    formData.value.address = row.address // 详细地址
+    formData.value.content = row.content // 作业活动概述
+    formData.value.nature = row.nature // 危险性质
+    formData.value.grade = row.grade // 等级
+    formData.value.assignPost = row.assignPost // 定岗
+    formData.value.staffQuota = Number(row.staffQuota) // 定员
+    formData.value.substancesQuantities = row.substancesQuantities // 危险物质及定量
+  }
+
+  // 详情隐藏表单校验
+  if (dialogstatus === 'detail') {
+    formDataRef.value?.clearValidate()
+  }
+  dialogStatus.value = dialogstatus // 类型 新建add 编辑edit 详情detail
+  btnLoading.value = false
+}
+
+// 关闭并刷新
+function closeRefresh() {
+  dialogVisible.value = false
+  resetForm()
+  emits('closeRefresh')
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible" :title="textMap[dialogStatus]" width="800" :before-close="closeRefresh" append-to-body
+    :open-delay="0" :close-on-click-modal="false"
+  >
+    <el-form
+      ref="formDataRef" :model="formData" :rules="rules" label-position="right" label-width="130px"
+      class="form-container" size="default" :disabled="dialogStatus === 'detail'" @submit.prevent
+    >
+      <el-row :gutter="10">
+        <el-col :span="12">
+          <el-form-item label="所属单位" prop="deptId">
+            <dept-select v-model="formData.deptId" placeholder="必选" :disabled="dialogStatus === 'detail'" :dept-show="true" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="危险源名称" prop="riskName">
+            <el-input :value="formData.riskName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="详细地址" prop="address">
+            <el-input :value="formData.address" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="作业活动概述" prop="content">
+            <el-input :value="formData.content" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="危险性质" prop="nature">
+            <el-input :value="formData.nature" :disabled="dialogStatus === 'detail'" type="text" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="等级" prop="grade">
+            <el-select
+              v-model="formData.grade"
+              placeholder="必选"
+              clearable
+              filterable
+              :disabled="dialogStatus === 'detail'"
+            >
+              <el-option v-for="item of deviceStatusList" :key="item.id" :label="item.name" :value="item.name "/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="定岗" prop="assignPost">
+            <el-input :value="formData.assignPost" :disabled="dialogStatus === 'detail'" type="text" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="定员" prop="staffQuota">
+            <el-input-number
+              v-model="formData.staffQuota" class="full-width-input"
+              :min="1" :precision="0" :step="1" placeholder="必填"
+              :disabled="dialogStatus === 'detail'"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="危险物质及定量" prop="substancesQuantities">
+            <el-input :value="formData.substancesQuantities" :disabled="dialogStatus === 'detail'" type="text" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button v-if="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button @click="closeRefresh">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//
+</style>
diff --git a/src/views/alarm/dangerAssessment/manage/list.vue b/src/views/alarm/dangerAssessment/manage/list.vue
index a1b6214..3e27450 100644
--- a/src/views/alarm/dangerAssessment/manage/list.vue
+++ b/src/views/alarm/dangerAssessment/manage/list.vue
@@ -5,61 +5,112 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IList, IListQuery } from './manage-interface'
 // import EditDialog from './editDialog.vue'
+import editPointDialog from './editPointDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { uploadApi } from '@/api/monitor/dev'
 import { getDictByCode } from '@/api/system/dict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { dictType } from '@/global'
+import { getDangerAssessmentManageList } from '@/api/alarm/dangerAssessment/manage'
 const { proxy } = getCurrentInstance() as any
 const editDialogRef = ref() // 组件
 const router = useRouter()
 // 文件上传input
 const fileRef = ref()
 const loading = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// ------------------------------------------------------------------------------------------
 // 默认查询条件
 const listQuery: Ref<IListQuery> = ref({
   area: '', // 所属区域
-  deptId: '', // 所属区域
-  dangerCategory: '', // 隐患分类
-  startTime: '', // 开始时间
-  endTime: '', // 结束时间
+  deptId: '', // 所属组织
+  riskName: '', // 危险点名称
+  riskType: '', // 危险点类型
   offset: 1,
   limit: 20,
 })
-// 表格表头
-const columns: Ref<TableColumn[]> = ref([
-  { text: '所属区域', value: 'area', align: 'center' },
+// ------------------------------------------表头---------------------------------------------
+const columns: Ref<TableColumn[]> = ref([]) // 表头
+// 危险点
+const columnsPoint: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '业务内容', value: 'businessContent', align: 'center' },
-  { text: '隐患分类Ⅰ', value: 'yhfl1', align: 'center' },
-  { text: '隐患分类Ⅱ', value: 'yhfl2', align: 'center' },
-  { text: '监控相机', value: 'equipmentName', align: 'center' },
-  { text: '录入时间', value: 'time', align: 'center' },
-  { text: '备注', value: 'remark', align: 'center' },
-])
+  { text: '危险点名称', value: 'riskName', align: 'center' },
+  { text: '详细地址', value: 'address', align: 'center' },
+  { text: '作业活动概述', value: 'content', align: 'center' },
+  { text: '危险性质', value: 'nature', align: 'center' },
+  { text: '等级', value: 'grade', align: 'center' },
+  { text: '定岗', value: 'assignPost', align: 'center' },
+  { text: '定员', value: 'staffQuota', align: 'center' },
+  { text: '危险物质及定量', value: 'substancesQuantities', align: 'center' },
+]
+// 重大危险源
+const columnsSource: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险源名称', value: 'businessContent', align: 'center' },
+  { text: '场所级别', value: 'yhfl1', align: 'center' },
+  { text: '危险化学品名称', value: 'yhfl2', align: 'center' },
+  { text: '危险性质', value: 'equipmentName', align: 'center' },
+  { text: '存量', value: 'time', align: 'center' },
+  { text: '临界量', value: 'remark', align: 'center' },
+  { text: '分级指数', value: 'remark', align: 'center' },
+  { text: '危险物质及定量', value: 'remark', align: 'center' },
+  { text: '危险源等级', value: 'remark', align: 'center' },
+]
+// 危险化学品场所
+const columnsChemistry: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险化学品场所', value: 'businessContent', align: 'center' },
+  { text: '场所分类', value: 'yhfl1', align: 'center' },
+  { text: '作业活动', value: 'yhfl2', align: 'center' },
+  { text: '危化品名称', value: 'equipmentName', align: 'center' },
+  { text: '危险性质', value: 'time', align: 'center' },
+  { text: '定岗', value: 'remark', align: 'center' },
+  { text: '定员', value: 'remark', align: 'center' },
+  { text: '定量', value: 'remark', align: 'center' },
+  { text: '定寿命', value: 'remark', align: 'center' },
+  { text: '定检', value: 'remark', align: 'center' },
+]
+// 危险作业
+const columnsWork: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险作业', value: 'businessContent', align: 'center' },
+  { text: '危险作业等级', value: 'yhfl1', align: 'center' },
+  { text: '主要危险描述', value: 'yhfl2', align: 'center' },
+  { text: '相关部门', value: 'equipmentName', align: 'center' },
+  { text: '作业频次', value: 'time', align: 'center' },
+]
+// 危险作业工序
+const columnsWorkProcesses: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险作业工序', value: 'businessContent', align: 'center' },
+  { text: '作业人员数量', value: 'yhfl1', align: 'center' },
+  { text: '事故类型', value: 'yhfl2', align: 'center' },
+]
+// -------------------------------------------------------------------------------------------
 const total = ref(0) // 数据条数
-const list = ref<IList[]>([]) // 数据条数
-const checkoutList = ref<IList[]>([]) // 数据条数
-// 开始结束时间
-const datetimerange = ref()
-watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
-  if (Array.isArray(newVal)) {
-    if (newVal.length) {
-      listQuery.value.startTime = `${newVal[0]} 00:00:00`
-      listQuery.value.endTime = `${newVal[1]} 23:59:59`
+const list = ref([]) // 数据条数
+const checkoutList = ref([]) // 数据条数
+
+const editPointDialogRef = ref() // 危险点ref
+// -----------------------------------------字典--------------------------------------------------------------
+// 查询字典
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('dangerAssessmentType')
+  // 制作右上角的菜单
+  const tempMenu = ['重大危险源', '危险点', '危险化学品场所', '危险作业', '危险作业工序']
+  tempMenu.forEach((item) => {
+    const tempFindData = res.data.find((e: { name: string; value: string }) => e.name === item)
+    if (tempFindData) {
+      menu.value.push({
+        name: tempFindData.name,
+        id: `${tempFindData.value}`,
+      })
     }
-  }
-})
-// ------------------------------------字典------------------------------------------
-// const statusList = ref<dictType[]>([]) // 在线状态
-const getDict = () => {
-  // // 在线状态
-  // getDictByCode('status').then((response) => {
-  //   statusList.value = response.data
-  // })
+  })
 }
-getDict()
 // -----------------------------------文件上传-------------------------------------------
 // 点击批量导入
 const batchImport = () => {
@@ -101,34 +152,12 @@
 // 查询数据
 const fetchData = () => {
   loading.value = true
-  // getDevListPage(listQuery).then((res: { data: { rows: []; total: number } }) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loading.value = false
-  // })
-  list.value = [{
-    id: '1',
-    area: '测试数据1', // 设备名称
-    deptName: '测试数据1', // 设备编号
-    businessContent: '测试数据1', // 所属单位
-    yhfl1: '测试数据1', // RTSP地址
-    yhfl2: '测试数据1', // 识别间隔
-    equipmentName: '测试数据1', // 告警间隔
-    time: '2021-11-11',
-    remark: '测试数据1', // 业务场景
-  },
-  {
-    id: '2',
-    area: '测试数据2', // 设备名称
-    deptName: '测试数据2', // 设备编号
-    businessContent: '测试数据2', // 所属单位
-    yhfl1: '测试数据2', // RTSP地址
-    yhfl2: '测试数据2', // 识别间隔
-    equipmentName: '测试数据2', // 告警间隔
-    time: '2022-09-08',
-    remark: '测试数据2', // 业务场景
-  },
-  ]
+  listQuery.value.riskType = active.value // 危险点类型
+  getDangerAssessmentManageList(listQuery.value).then((res: { data: { rows: []; total: number } }) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    loading.value = false
+  })
   loading.value = false
 }
 
@@ -136,14 +165,12 @@
 const reset = () => {
   listQuery.value = {
     area: '', // 所属区域
-    deptId: '', // 所属区域
-    dangerCategory: '', // 隐患分类
-    startTime: '', // 开始时间
-    endTime: '', // 结束时间
+    deptId: '', // 所属组织
+    riskName: '', // 危险点名称
+    riskType: '', // 危险点类型
     offset: 1,
     limit: 20,
   }
-  datetimerange.value = []
   fetchData()
 }
 
@@ -154,17 +181,57 @@
 
 // 新增
 const add = (row: IList) => {
-  ElMessage.info('敬请期待')
+  switch (active.value) {
+    case '1': // 危险点
+      editPointDialogRef.value.initDialog('add')
+      break
+    case '2': // 重大危险源
+      break
+    case '3': // 危险化学品场所
+      break
+    case '4': // 危险作业
+      break
+    case '5': // 危险作业工序
+      break
+  }
   // editDialogRef.value.initDialog('add')
 }
 // 详情
 const detail = (row: IList) => {
-  editDialogRef.value.initDialog('detail', row)
+  switch (active.value) {
+    case '1': // 危险点
+      editPointDialogRef.value.initDialog('detail', row)
+      break
+    case '2': // 重大危险源
+      break
+    case '3': // 危险化学品场所
+      break
+    case '4': // 危险作业
+      break
+    case '5': // 危险作业工序
+      break
+  }
+}
+// 编辑
+const edit = (row: IList) => {
+  switch (active.value) {
+    case '1': // 危险点
+      editPointDialogRef.value.initDialog('edit', row)
+      break
+    case '2': // 重大危险源
+      break
+    case '3': // 危险化学品场所
+      break
+    case '4': // 危险作业
+      break
+    case '5': // 危险作业工序
+      break
+  }
 }
 // 删除
 const del = (row: IList) => {
   ElMessageBox.confirm(
-    `确定要删除${row.equipmentName}吗？`,
+    '确定删除吗？',
     '确认删除',
     {
       confirmButtonText: '确定',
@@ -191,7 +258,39 @@
   fetchData()
 }
 
-onMounted(() => {
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  reset()
+}
+
+watch(() => active.value, (newValue) => {
+  console.log(newValue)
+  switch (newValue) {
+    case '1': // 危险点
+      columns.value = columnsPoint
+      break
+    case '2': // 重大危险源
+      columns.value = columnsSource
+      break
+    case '3': // 危险化学品场所
+      columns.value = columnsChemistry
+      break
+    case '4': // 危险作业
+      columns.value = columnsWork
+      break
+    case '5': // 危险作业工序
+      columns.value = columnsWorkProcesses
+      break
+    default:
+      columns.value = columnsPoint
+      break
+  }
+}, { immediate: true })
+
+onMounted(async () => {
+  await getDict()
+  active.value = '1'
   fetchData()
 })
 </script>
@@ -200,19 +299,10 @@
   <app-container>
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.area" placeholder="所属区域" clearable style="width: 200px;" @change="search" />
+        <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search" @changeDept="search"/>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search" />
-      </search-item>
-      <search-item>
-        <el-input v-model="listQuery.dangerCategory" placeholder="隐患分类" clearable style="width: 200px;" @change="search" />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
-          range-separator="至" start-placeholder="录入时间(开始)" end-placeholder="录入时间(结束)" @change="search"
-        />
+        <el-input v-model="listQuery.riskName" placeholder="危险点名称" clearable style="width: 200px;" />
       </search-item>
     </search-area>
     <table-container>
@@ -222,12 +312,22 @@
       </template>
       <input v-show="false" ref="fileRef" type="file" accept="xlsx/*" @change="onFileChange">
       <normal-table :query="listQuery" :list-loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" width="120" align="center">
+          <el-table-column label="操作" width="150" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" class="table-text-button" @click="detail(scope.row)">
                 详情
               </el-button>
+              <el-button type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
+                编辑
+              </el-button>
               <el-button type="danger" link size="small" class="table-text-button" @click="del(scope.row)">
                 删除
               </el-button>
@@ -237,5 +337,9 @@
       </normal-table>
     </table-container>
     <edit-dialog ref="editDialogRef" @close-refresh="search" />
+    <!-- 编辑危险点 -->
+    <edit-point-dialog ref="editPointDialogRef" />
+    <!-- 右上角按钮集合 -->
+    <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
   </app-container>
 </template>
diff --git a/src/views/alarm/dangerAssessment/manage/manage-interface.ts b/src/views/alarm/dangerAssessment/manage/manage-interface.ts
index e19c1be..3740441 100644
--- a/src/views/alarm/dangerAssessment/manage/manage-interface.ts
+++ b/src/views/alarm/dangerAssessment/manage/manage-interface.ts
@@ -1,9 +1,8 @@
 export interface IListQuery {
   area: string // 所属区域
-  deptId: string // 所属区域
-  dangerCategory: string // 隐患分类
-  startTime: string // 开始时间
-  endTime: string // 结束时间
+  deptId: string // 所属组织
+  riskName: string // 危险点名称
+  riskType: string // 危险点类型
   offset: number
   limit: number
 }

diff --git a/public/config/config.json b/public/config/config.json
index a85fc42..29161c3 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -10,5 +10,5 @@
   "maxZoom": "13",
   "zoom": "10",
   "timeGap": 3000,
-  "systemType": "sm"
+  "systemType": "gm"
 }
diff --git a/src/api/alarm/dangerAssessment/manage.ts b/src/api/alarm/dangerAssessment/manage.ts
new file mode 100644
index 0000000..dae1056
--- /dev/null
+++ b/src/api/alarm/dangerAssessment/manage.ts
@@ -0,0 +1,50 @@
+/**
+ * 安全生产隐患管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getDangerAssessmentManageList(data: any) {
+  return request({
+    url: 'risk/listPage',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 详情
+export function getDangerAssessmentManageDetail(data: { id: string }) {
+  return request({
+    url: 'risk/detail',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 新增
+export function addDangerAssessmentManage(data: object) {
+  return request({
+    url: 'risk/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateDangerAssessmentManage(data: object) {
+  return request({
+    url: 'risk/update',
+    method: 'post',
+    data,
+  })
+}
+
+// 批量导入
+export function batchImport(data: object) {
+  return request({
+    url: 'risk/batchImport',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/alarm/policyConfig/monitorPoint.ts b/src/api/alarm/policyConfig/monitorPoint.ts
new file mode 100644
index 0000000..e4cd648
--- /dev/null
+++ b/src/api/alarm/policyConfig/monitorPoint.ts
@@ -0,0 +1,68 @@
+/**
+ * 监控点位管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getMonitorPointList(data: any) {
+  return request({
+    url: 'device/relation/listPage',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 详情
+export function getMonitorPointDetail(data: { id: string }) {
+  return request({
+    url: 'device/relation/detail',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 编辑
+export function updateMonitorPoint(data: object) {
+  return request({
+    url: 'device/relation/update',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取盒子列表
+export function getBoxList(data: any) {
+  return request({
+    url: 'device/box/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 获取算法列表
+export function getModelList(data: any) {
+  return request({
+    url: 'device/model/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 获取算法-场景对象列表
+export function getSceneList(data: any) {
+  return request({
+    url: 'scene/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 算法报警对象
+export function getRecognitionList(data: any) {
+  return request({
+    url: 'device/recognitionType/recognitionList',
+    method: 'get',
+    params: data,
+  })
+}
+
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 04b39cc..92165e1 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -40,7 +40,7 @@
     default: 'default',
   }, // 输入框大小
 })
-const emit = defineEmits(['update:modelValue'])
+const emit = defineEmits(['update:modelValue', 'changeDept'])
 // ------------定义props参数----------
 const value = computed({
   get() {
@@ -153,6 +153,10 @@
     return []
   }
 }
+
+const changeDept = (val: any) => {
+  emit('changeDept', val)
+}
 // --------暴露方法
 defineExpose({ refreshTree, fetchDeptTree, findChildren })
 </script>
@@ -176,6 +180,7 @@
       filterable
       class="full-width-input"
       :disabled="props.disabled"
+      @change="changeDept"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index d1f5b24..e3d6460 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -8,5 +8,6 @@
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
   fixed?: boolean // 固定列
+  required?: boolean // 是否必填
 }
 
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
index 31a16b9..fb5f8ac 100644
--- a/src/utils/useCheckList.ts
+++ b/src/utils/useCheckList.ts
@@ -1,5 +1,4 @@
 import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 
 /**
  * 检查列表
@@ -7,13 +6,14 @@
  * @param columns // 表头信息
  * @param tableTitle // 表格名称
  */
-export function useCheckList(list: { [key: string]: string }[], columns: TableColumn, tableTitle = '') {
+export function useCheckList(list: { [key: string]: string }[], columns: any, tableTitle = '') {
   for (let index = 0; index < list.length; index++) {
     const item = list[index]
     for (const prop of columns) {
       // 检查必填
       if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        // ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        ElMessage.warning(`请先完善${tableTitle}中【${item.typeName}】的${prop.text}`)
         return false
       }
       // 验证正则
diff --git a/src/views/alarm/dangerAssessment/manage/editPointDialog.vue b/src/views/alarm/dangerAssessment/manage/editPointDialog.vue
new file mode 100644
index 0000000..db4b29f
--- /dev/null
+++ b/src/views/alarm/dangerAssessment/manage/editPointDialog.vue
@@ -0,0 +1,219 @@
+<!-- 新增、编辑危险点 -->
+<script lang="ts" setup name="EditPointDialog">
+import { reactive, ref } from 'vue'
+import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { addDangerAssessmentManage, updateDangerAssessmentManage } from '@/api/alarm/dangerAssessment/manage'
+const emits = defineEmits(['closeRefresh'])
+const dialogStatus = ref('add')
+const dialogVisible = ref(false) // 弹窗显示隐藏
+// 显示标题
+const textMap: { [key: string]: string } = {
+  detail: '详情',
+  edit: '编辑',
+  add: '新增',
+}
+
+// 表单数据对象
+const formData = ref({
+  id: '',
+  deptId: '', // 所属单位id
+  deptName: '', // 所属单位
+  riskName: '', // 危险点名称
+  address: '', // 详细地址
+  content: '', // 作业活动概述
+  nature: '', // 危险性质
+  grade: '', // 等级
+  assignPost: '', // 定岗
+  staffQuota: 1, // 定员
+  substancesQuantities: '', // 危险物质及定量
+})
+const btnLoading = ref(false) // 保存按钮加载状态
+const formDataRef = ref<FormInstance>() // 表单对象
+// 校验规则
+const rules = reactive<FormRules>({
+  deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
+  riskName: [{ required: true, message: '危险点名称必填', trigger: ['blur', 'change'] }],
+  address: [{ required: true, message: '详细地址必填', trigger: ['blur', 'change'] }],
+  content: [{ required: true, message: '作业活动概述必填', trigger: ['blur', 'change'] }],
+  nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
+  grade: [{ required: true, message: '等级必填', trigger: ['blur', 'change'] }],
+  assignPost: [{ required: true, message: '定岗必填', trigger: ['blur', 'change'] }],
+  staffQuota: [{ required: true, message: '定员必填', trigger: ['blur', 'change'] }],
+  substancesQuantities: [{ required: true, message: '危险物质及定量必填', trigger: ['blur', 'change'] }],
+})
+
+// -----------------------------------------字典--------------------------------------------------------------
+const deviceStatusList = ref<dictType[]>([]) // 危险点等级
+const getDict = async () => {
+  // 危险点等级
+  getDictByCode('dangerPointGrade').then((response) => {
+    deviceStatusList.value = response.data
+  })
+}
+getDict()
+// -------------------------------------------------------------------------------------------
+// 表单提交
+function submitForm() {
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.warning('新增危险点成功')
+            return false
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.warning('编辑危险点成功')
+            return false
+          })
+        }
+      }
+    })
+  }
+}
+
+// 重置表单
+function resetForm() {
+  formData.value = {
+    id: '',
+    deptId: '', // 所属单位id
+    deptName: '', // 所属单位
+    riskName: '', // 危险点名称
+    address: '', // 详细地址
+    content: '', // 作业活动概述
+    nature: '', // 危险性质
+    grade: '', // 等级
+    assignPost: '', // 定岗
+    staffQuota: 1, // 定员
+    substancesQuantities: '', // 危险物质及定量
+  }
+}
+
+// -----------------------------------初始化、关闭对话框相关-----------------------------------------
+function initDialog(dialogstatus: string, row: any) {
+  dialogVisible.value = true
+  if (dialogstatus === 'edit' || dialogstatus === 'detail') {
+    formData.value.id = row.id
+    formData.value.deptId = row.deptId // 所属单位id
+    formData.value.deptName = row.deptName // 所属单位
+    formData.value.riskName = row.riskName // 危险点名称
+    formData.value.address = row.address // 详细地址
+    formData.value.content = row.content // 作业活动概述
+    formData.value.nature = row.nature // 危险性质
+    formData.value.grade = row.grade // 等级
+    formData.value.assignPost = row.assignPost // 定岗
+    formData.value.staffQuota = Number(row.staffQuota) // 定员
+    formData.value.substancesQuantities = row.substancesQuantities // 危险物质及定量
+  }
+
+  // 详情隐藏表单校验
+  if (dialogstatus === 'detail') {
+    formDataRef.value?.clearValidate()
+  }
+  dialogStatus.value = dialogstatus // 类型 新建add 编辑edit 详情detail
+  btnLoading.value = false
+}
+
+// 关闭并刷新
+function closeRefresh() {
+  dialogVisible.value = false
+  resetForm()
+  emits('closeRefresh')
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible" :title="textMap[dialogStatus]" width="800" :before-close="closeRefresh" append-to-body
+    :open-delay="0" :close-on-click-modal="false"
+  >
+    <el-form
+      ref="formDataRef" :model="formData" :rules="rules" label-position="right" label-width="130px"
+      class="form-container" size="default" :disabled="dialogStatus === 'detail'" @submit.prevent
+    >
+      <el-row :gutter="10">
+        <el-col :span="12">
+          <el-form-item label="所属单位" prop="deptId">
+            <dept-select v-model="formData.deptId" placeholder="必选" :disabled="dialogStatus === 'detail'" :dept-show="true" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="危险源名称" prop="riskName">
+            <el-input :value="formData.riskName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="详细地址" prop="address">
+            <el-input :value="formData.address" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="作业活动概述" prop="content">
+            <el-input :value="formData.content" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="危险性质" prop="nature">
+            <el-input :value="formData.nature" :disabled="dialogStatus === 'detail'" type="text" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="等级" prop="grade">
+            <el-select
+              v-model="formData.grade"
+              placeholder="必选"
+              clearable
+              filterable
+              :disabled="dialogStatus === 'detail'"
+            >
+              <el-option v-for="item of deviceStatusList" :key="item.id" :label="item.name" :value="item.name "/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="定岗" prop="assignPost">
+            <el-input :value="formData.assignPost" :disabled="dialogStatus === 'detail'" type="text" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="定员" prop="staffQuota">
+            <el-input-number
+              v-model="formData.staffQuota" class="full-width-input"
+              :min="1" :precision="0" :step="1" placeholder="必填"
+              :disabled="dialogStatus === 'detail'"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="危险物质及定量" prop="substancesQuantities">
+            <el-input :value="formData.substancesQuantities" :disabled="dialogStatus === 'detail'" type="text" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button v-if="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button @click="closeRefresh">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//
+</style>
diff --git a/src/views/alarm/dangerAssessment/manage/list.vue b/src/views/alarm/dangerAssessment/manage/list.vue
index a1b6214..3e27450 100644
--- a/src/views/alarm/dangerAssessment/manage/list.vue
+++ b/src/views/alarm/dangerAssessment/manage/list.vue
@@ -5,61 +5,112 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IList, IListQuery } from './manage-interface'
 // import EditDialog from './editDialog.vue'
+import editPointDialog from './editPointDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { uploadApi } from '@/api/monitor/dev'
 import { getDictByCode } from '@/api/system/dict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { dictType } from '@/global'
+import { getDangerAssessmentManageList } from '@/api/alarm/dangerAssessment/manage'
 const { proxy } = getCurrentInstance() as any
 const editDialogRef = ref() // 组件
 const router = useRouter()
 // 文件上传input
 const fileRef = ref()
 const loading = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// ------------------------------------------------------------------------------------------
 // 默认查询条件
 const listQuery: Ref<IListQuery> = ref({
   area: '', // 所属区域
-  deptId: '', // 所属区域
-  dangerCategory: '', // 隐患分类
-  startTime: '', // 开始时间
-  endTime: '', // 结束时间
+  deptId: '', // 所属组织
+  riskName: '', // 危险点名称
+  riskType: '', // 危险点类型
   offset: 1,
   limit: 20,
 })
-// 表格表头
-const columns: Ref<TableColumn[]> = ref([
-  { text: '所属区域', value: 'area', align: 'center' },
+// ------------------------------------------表头---------------------------------------------
+const columns: Ref<TableColumn[]> = ref([]) // 表头
+// 危险点
+const columnsPoint: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '业务内容', value: 'businessContent', align: 'center' },
-  { text: '隐患分类Ⅰ', value: 'yhfl1', align: 'center' },
-  { text: '隐患分类Ⅱ', value: 'yhfl2', align: 'center' },
-  { text: '监控相机', value: 'equipmentName', align: 'center' },
-  { text: '录入时间', value: 'time', align: 'center' },
-  { text: '备注', value: 'remark', align: 'center' },
-])
+  { text: '危险点名称', value: 'riskName', align: 'center' },
+  { text: '详细地址', value: 'address', align: 'center' },
+  { text: '作业活动概述', value: 'content', align: 'center' },
+  { text: '危险性质', value: 'nature', align: 'center' },
+  { text: '等级', value: 'grade', align: 'center' },
+  { text: '定岗', value: 'assignPost', align: 'center' },
+  { text: '定员', value: 'staffQuota', align: 'center' },
+  { text: '危险物质及定量', value: 'substancesQuantities', align: 'center' },
+]
+// 重大危险源
+const columnsSource: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险源名称', value: 'businessContent', align: 'center' },
+  { text: '场所级别', value: 'yhfl1', align: 'center' },
+  { text: '危险化学品名称', value: 'yhfl2', align: 'center' },
+  { text: '危险性质', value: 'equipmentName', align: 'center' },
+  { text: '存量', value: 'time', align: 'center' },
+  { text: '临界量', value: 'remark', align: 'center' },
+  { text: '分级指数', value: 'remark', align: 'center' },
+  { text: '危险物质及定量', value: 'remark', align: 'center' },
+  { text: '危险源等级', value: 'remark', align: 'center' },
+]
+// 危险化学品场所
+const columnsChemistry: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险化学品场所', value: 'businessContent', align: 'center' },
+  { text: '场所分类', value: 'yhfl1', align: 'center' },
+  { text: '作业活动', value: 'yhfl2', align: 'center' },
+  { text: '危化品名称', value: 'equipmentName', align: 'center' },
+  { text: '危险性质', value: 'time', align: 'center' },
+  { text: '定岗', value: 'remark', align: 'center' },
+  { text: '定员', value: 'remark', align: 'center' },
+  { text: '定量', value: 'remark', align: 'center' },
+  { text: '定寿命', value: 'remark', align: 'center' },
+  { text: '定检', value: 'remark', align: 'center' },
+]
+// 危险作业
+const columnsWork: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险作业', value: 'businessContent', align: 'center' },
+  { text: '危险作业等级', value: 'yhfl1', align: 'center' },
+  { text: '主要危险描述', value: 'yhfl2', align: 'center' },
+  { text: '相关部门', value: 'equipmentName', align: 'center' },
+  { text: '作业频次', value: 'time', align: 'center' },
+]
+// 危险作业工序
+const columnsWorkProcesses: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险作业工序', value: 'businessContent', align: 'center' },
+  { text: '作业人员数量', value: 'yhfl1', align: 'center' },
+  { text: '事故类型', value: 'yhfl2', align: 'center' },
+]
+// -------------------------------------------------------------------------------------------
 const total = ref(0) // 数据条数
-const list = ref<IList[]>([]) // 数据条数
-const checkoutList = ref<IList[]>([]) // 数据条数
-// 开始结束时间
-const datetimerange = ref()
-watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
-  if (Array.isArray(newVal)) {
-    if (newVal.length) {
-      listQuery.value.startTime = `${newVal[0]} 00:00:00`
-      listQuery.value.endTime = `${newVal[1]} 23:59:59`
+const list = ref([]) // 数据条数
+const checkoutList = ref([]) // 数据条数
+
+const editPointDialogRef = ref() // 危险点ref
+// -----------------------------------------字典--------------------------------------------------------------
+// 查询字典
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('dangerAssessmentType')
+  // 制作右上角的菜单
+  const tempMenu = ['重大危险源', '危险点', '危险化学品场所', '危险作业', '危险作业工序']
+  tempMenu.forEach((item) => {
+    const tempFindData = res.data.find((e: { name: string; value: string }) => e.name === item)
+    if (tempFindData) {
+      menu.value.push({
+        name: tempFindData.name,
+        id: `${tempFindData.value}`,
+      })
     }
-  }
-})
-// ------------------------------------字典------------------------------------------
-// const statusList = ref<dictType[]>([]) // 在线状态
-const getDict = () => {
-  // // 在线状态
-  // getDictByCode('status').then((response) => {
-  //   statusList.value = response.data
-  // })
+  })
 }
-getDict()
 // -----------------------------------文件上传-------------------------------------------
 // 点击批量导入
 const batchImport = () => {
@@ -101,34 +152,12 @@
 // 查询数据
 const fetchData = () => {
   loading.value = true
-  // getDevListPage(listQuery).then((res: { data: { rows: []; total: number } }) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loading.value = false
-  // })
-  list.value = [{
-    id: '1',
-    area: '测试数据1', // 设备名称
-    deptName: '测试数据1', // 设备编号
-    businessContent: '测试数据1', // 所属单位
-    yhfl1: '测试数据1', // RTSP地址
-    yhfl2: '测试数据1', // 识别间隔
-    equipmentName: '测试数据1', // 告警间隔
-    time: '2021-11-11',
-    remark: '测试数据1', // 业务场景
-  },
-  {
-    id: '2',
-    area: '测试数据2', // 设备名称
-    deptName: '测试数据2', // 设备编号
-    businessContent: '测试数据2', // 所属单位
-    yhfl1: '测试数据2', // RTSP地址
-    yhfl2: '测试数据2', // 识别间隔
-    equipmentName: '测试数据2', // 告警间隔
-    time: '2022-09-08',
-    remark: '测试数据2', // 业务场景
-  },
-  ]
+  listQuery.value.riskType = active.value // 危险点类型
+  getDangerAssessmentManageList(listQuery.value).then((res: { data: { rows: []; total: number } }) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    loading.value = false
+  })
   loading.value = false
 }
 
@@ -136,14 +165,12 @@
 const reset = () => {
   listQuery.value = {
     area: '', // 所属区域
-    deptId: '', // 所属区域
-    dangerCategory: '', // 隐患分类
-    startTime: '', // 开始时间
-    endTime: '', // 结束时间
+    deptId: '', // 所属组织
+    riskName: '', // 危险点名称
+    riskType: '', // 危险点类型
     offset: 1,
     limit: 20,
   }
-  datetimerange.value = []
   fetchData()
 }
 
@@ -154,17 +181,57 @@
 
 // 新增
 const add = (row: IList) => {
-  ElMessage.info('敬请期待')
+  switch (active.value) {
+    case '1': // 危险点
+      editPointDialogRef.value.initDialog('add')
+      break
+    case '2': // 重大危险源
+      break
+    case '3': // 危险化学品场所
+      break
+    case '4': // 危险作业
+      break
+    case '5': // 危险作业工序
+      break
+  }
   // editDialogRef.value.initDialog('add')
 }
 // 详情
 const detail = (row: IList) => {
-  editDialogRef.value.initDialog('detail', row)
+  switch (active.value) {
+    case '1': // 危险点
+      editPointDialogRef.value.initDialog('detail', row)
+      break
+    case '2': // 重大危险源
+      break
+    case '3': // 危险化学品场所
+      break
+    case '4': // 危险作业
+      break
+    case '5': // 危险作业工序
+      break
+  }
+}
+// 编辑
+const edit = (row: IList) => {
+  switch (active.value) {
+    case '1': // 危险点
+      editPointDialogRef.value.initDialog('edit', row)
+      break
+    case '2': // 重大危险源
+      break
+    case '3': // 危险化学品场所
+      break
+    case '4': // 危险作业
+      break
+    case '5': // 危险作业工序
+      break
+  }
 }
 // 删除
 const del = (row: IList) => {
   ElMessageBox.confirm(
-    `确定要删除${row.equipmentName}吗？`,
+    '确定删除吗？',
     '确认删除',
     {
       confirmButtonText: '确定',
@@ -191,7 +258,39 @@
   fetchData()
 }
 
-onMounted(() => {
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  reset()
+}
+
+watch(() => active.value, (newValue) => {
+  console.log(newValue)
+  switch (newValue) {
+    case '1': // 危险点
+      columns.value = columnsPoint
+      break
+    case '2': // 重大危险源
+      columns.value = columnsSource
+      break
+    case '3': // 危险化学品场所
+      columns.value = columnsChemistry
+      break
+    case '4': // 危险作业
+      columns.value = columnsWork
+      break
+    case '5': // 危险作业工序
+      columns.value = columnsWorkProcesses
+      break
+    default:
+      columns.value = columnsPoint
+      break
+  }
+}, { immediate: true })
+
+onMounted(async () => {
+  await getDict()
+  active.value = '1'
   fetchData()
 })
 </script>
@@ -200,19 +299,10 @@
   <app-container>
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.area" placeholder="所属区域" clearable style="width: 200px;" @change="search" />
+        <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search" @changeDept="search"/>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search" />
-      </search-item>
-      <search-item>
-        <el-input v-model="listQuery.dangerCategory" placeholder="隐患分类" clearable style="width: 200px;" @change="search" />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
-          range-separator="至" start-placeholder="录入时间(开始)" end-placeholder="录入时间(结束)" @change="search"
-        />
+        <el-input v-model="listQuery.riskName" placeholder="危险点名称" clearable style="width: 200px;" />
       </search-item>
     </search-area>
     <table-container>
@@ -222,12 +312,22 @@
       </template>
       <input v-show="false" ref="fileRef" type="file" accept="xlsx/*" @change="onFileChange">
       <normal-table :query="listQuery" :list-loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" width="120" align="center">
+          <el-table-column label="操作" width="150" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" class="table-text-button" @click="detail(scope.row)">
                 详情
               </el-button>
+              <el-button type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
+                编辑
+              </el-button>
               <el-button type="danger" link size="small" class="table-text-button" @click="del(scope.row)">
                 删除
               </el-button>
@@ -237,5 +337,9 @@
       </normal-table>
     </table-container>
     <edit-dialog ref="editDialogRef" @close-refresh="search" />
+    <!-- 编辑危险点 -->
+    <edit-point-dialog ref="editPointDialogRef" />
+    <!-- 右上角按钮集合 -->
+    <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
   </app-container>
 </template>
diff --git a/src/views/alarm/dangerAssessment/manage/manage-interface.ts b/src/views/alarm/dangerAssessment/manage/manage-interface.ts
index e19c1be..3740441 100644
--- a/src/views/alarm/dangerAssessment/manage/manage-interface.ts
+++ b/src/views/alarm/dangerAssessment/manage/manage-interface.ts
@@ -1,9 +1,8 @@
 export interface IListQuery {
   area: string // 所属区域
-  deptId: string // 所属区域
-  dangerCategory: string // 隐患分类
-  startTime: string // 开始时间
-  endTime: string // 结束时间
+  deptId: string // 所属组织
+  riskName: string // 危险点名称
+  riskType: string // 危险点类型
   offset: number
   limit: number
 }
diff --git a/src/views/alarm/policyConfig/monitorPoint/drawArea.vue b/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
index e902322..6e72273 100644
--- a/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
@@ -1,4 +1,10 @@
 <script lang="ts" setup name="DrawArea">
+const props = defineProps({
+  dialogStatus: {
+    type: String,
+  },
+})
+const emits = defineEmits(['givePoints'])
 const points = ref([ // 标记点初始
   { x: 50, y: 50 }, // 左上
   { x: 150, y: 50 },
@@ -25,6 +31,9 @@
   }
 
   function drag(e: any, pointIndex: number) {
+    if (props.dialogStatus === 'detail') {
+      return
+    }
     e = e || window.event
     e.preventDefault()
     var mousePos = { x: e.clientX - canvas.getBoundingClientRect().left, y: e.clientY - canvas.getBoundingClientRect().top }
@@ -48,6 +57,9 @@
   }
 
   function addDragEvents() {
+    if (props.dialogStatus === 'detail') {
+      return
+    }
     var dragEvents = {
       dragStart(e: any) {
         e = e || window.event
@@ -98,6 +110,7 @@
 ])
 
 watch(() => points.value, () => {
+  emits('givePoints', points.value)
   style.value = [
     {
       top: `${points.value[0].y - 5}px`,
@@ -124,7 +137,7 @@
 <template>
   <div style="width: 400px;height: 300px;">
     <canvas id="myCanvas" width="400" height="300" class="canvans" />
-    <div v-for="(item, index) in points" :key="index" class="point" :style="style[index]" />
+    <div v-for="(item, index) in points" :key="index" :class="props.dialogStatus === 'detail' ? 'detail-point' : 'point'" :style="style[index]" />
   </div>
 </template>
 
@@ -158,4 +171,19 @@
     cursor: move;
   }
 }
+.detail-point {
+  width: 10px;
+  height: 10px;
+  position: absolute;
+  border-radius: 50%;
+  background-color: red;
+  opacity: 0.5;
+  top: 0;
+  left: 0;
+  z-index: 99;
+
+  &:hover {
+    cursor: not-allowed
+  }
+}
 </style>

diff --git a/public/config/config.json b/public/config/config.json
index a85fc42..29161c3 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -10,5 +10,5 @@
   "maxZoom": "13",
   "zoom": "10",
   "timeGap": 3000,
-  "systemType": "sm"
+  "systemType": "gm"
 }
diff --git a/src/api/alarm/dangerAssessment/manage.ts b/src/api/alarm/dangerAssessment/manage.ts
new file mode 100644
index 0000000..dae1056
--- /dev/null
+++ b/src/api/alarm/dangerAssessment/manage.ts
@@ -0,0 +1,50 @@
+/**
+ * 安全生产隐患管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getDangerAssessmentManageList(data: any) {
+  return request({
+    url: 'risk/listPage',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 详情
+export function getDangerAssessmentManageDetail(data: { id: string }) {
+  return request({
+    url: 'risk/detail',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 新增
+export function addDangerAssessmentManage(data: object) {
+  return request({
+    url: 'risk/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateDangerAssessmentManage(data: object) {
+  return request({
+    url: 'risk/update',
+    method: 'post',
+    data,
+  })
+}
+
+// 批量导入
+export function batchImport(data: object) {
+  return request({
+    url: 'risk/batchImport',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/alarm/policyConfig/monitorPoint.ts b/src/api/alarm/policyConfig/monitorPoint.ts
new file mode 100644
index 0000000..e4cd648
--- /dev/null
+++ b/src/api/alarm/policyConfig/monitorPoint.ts
@@ -0,0 +1,68 @@
+/**
+ * 监控点位管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getMonitorPointList(data: any) {
+  return request({
+    url: 'device/relation/listPage',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 详情
+export function getMonitorPointDetail(data: { id: string }) {
+  return request({
+    url: 'device/relation/detail',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 编辑
+export function updateMonitorPoint(data: object) {
+  return request({
+    url: 'device/relation/update',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取盒子列表
+export function getBoxList(data: any) {
+  return request({
+    url: 'device/box/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 获取算法列表
+export function getModelList(data: any) {
+  return request({
+    url: 'device/model/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 获取算法-场景对象列表
+export function getSceneList(data: any) {
+  return request({
+    url: 'scene/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 算法报警对象
+export function getRecognitionList(data: any) {
+  return request({
+    url: 'device/recognitionType/recognitionList',
+    method: 'get',
+    params: data,
+  })
+}
+
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 04b39cc..92165e1 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -40,7 +40,7 @@
     default: 'default',
   }, // 输入框大小
 })
-const emit = defineEmits(['update:modelValue'])
+const emit = defineEmits(['update:modelValue', 'changeDept'])
 // ------------定义props参数----------
 const value = computed({
   get() {
@@ -153,6 +153,10 @@
     return []
   }
 }
+
+const changeDept = (val: any) => {
+  emit('changeDept', val)
+}
 // --------暴露方法
 defineExpose({ refreshTree, fetchDeptTree, findChildren })
 </script>
@@ -176,6 +180,7 @@
       filterable
       class="full-width-input"
       :disabled="props.disabled"
+      @change="changeDept"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index d1f5b24..e3d6460 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -8,5 +8,6 @@
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
   fixed?: boolean // 固定列
+  required?: boolean // 是否必填
 }
 
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
index 31a16b9..fb5f8ac 100644
--- a/src/utils/useCheckList.ts
+++ b/src/utils/useCheckList.ts
@@ -1,5 +1,4 @@
 import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 
 /**
  * 检查列表
@@ -7,13 +6,14 @@
  * @param columns // 表头信息
  * @param tableTitle // 表格名称
  */
-export function useCheckList(list: { [key: string]: string }[], columns: TableColumn, tableTitle = '') {
+export function useCheckList(list: { [key: string]: string }[], columns: any, tableTitle = '') {
   for (let index = 0; index < list.length; index++) {
     const item = list[index]
     for (const prop of columns) {
       // 检查必填
       if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        // ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        ElMessage.warning(`请先完善${tableTitle}中【${item.typeName}】的${prop.text}`)
         return false
       }
       // 验证正则
diff --git a/src/views/alarm/dangerAssessment/manage/editPointDialog.vue b/src/views/alarm/dangerAssessment/manage/editPointDialog.vue
new file mode 100644
index 0000000..db4b29f
--- /dev/null
+++ b/src/views/alarm/dangerAssessment/manage/editPointDialog.vue
@@ -0,0 +1,219 @@
+<!-- 新增、编辑危险点 -->
+<script lang="ts" setup name="EditPointDialog">
+import { reactive, ref } from 'vue'
+import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { addDangerAssessmentManage, updateDangerAssessmentManage } from '@/api/alarm/dangerAssessment/manage'
+const emits = defineEmits(['closeRefresh'])
+const dialogStatus = ref('add')
+const dialogVisible = ref(false) // 弹窗显示隐藏
+// 显示标题
+const textMap: { [key: string]: string } = {
+  detail: '详情',
+  edit: '编辑',
+  add: '新增',
+}
+
+// 表单数据对象
+const formData = ref({
+  id: '',
+  deptId: '', // 所属单位id
+  deptName: '', // 所属单位
+  riskName: '', // 危险点名称
+  address: '', // 详细地址
+  content: '', // 作业活动概述
+  nature: '', // 危险性质
+  grade: '', // 等级
+  assignPost: '', // 定岗
+  staffQuota: 1, // 定员
+  substancesQuantities: '', // 危险物质及定量
+})
+const btnLoading = ref(false) // 保存按钮加载状态
+const formDataRef = ref<FormInstance>() // 表单对象
+// 校验规则
+const rules = reactive<FormRules>({
+  deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
+  riskName: [{ required: true, message: '危险点名称必填', trigger: ['blur', 'change'] }],
+  address: [{ required: true, message: '详细地址必填', trigger: ['blur', 'change'] }],
+  content: [{ required: true, message: '作业活动概述必填', trigger: ['blur', 'change'] }],
+  nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
+  grade: [{ required: true, message: '等级必填', trigger: ['blur', 'change'] }],
+  assignPost: [{ required: true, message: '定岗必填', trigger: ['blur', 'change'] }],
+  staffQuota: [{ required: true, message: '定员必填', trigger: ['blur', 'change'] }],
+  substancesQuantities: [{ required: true, message: '危险物质及定量必填', trigger: ['blur', 'change'] }],
+})
+
+// -----------------------------------------字典--------------------------------------------------------------
+const deviceStatusList = ref<dictType[]>([]) // 危险点等级
+const getDict = async () => {
+  // 危险点等级
+  getDictByCode('dangerPointGrade').then((response) => {
+    deviceStatusList.value = response.data
+  })
+}
+getDict()
+// -------------------------------------------------------------------------------------------
+// 表单提交
+function submitForm() {
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.warning('新增危险点成功')
+            return false
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.warning('编辑危险点成功')
+            return false
+          })
+        }
+      }
+    })
+  }
+}
+
+// 重置表单
+function resetForm() {
+  formData.value = {
+    id: '',
+    deptId: '', // 所属单位id
+    deptName: '', // 所属单位
+    riskName: '', // 危险点名称
+    address: '', // 详细地址
+    content: '', // 作业活动概述
+    nature: '', // 危险性质
+    grade: '', // 等级
+    assignPost: '', // 定岗
+    staffQuota: 1, // 定员
+    substancesQuantities: '', // 危险物质及定量
+  }
+}
+
+// -----------------------------------初始化、关闭对话框相关-----------------------------------------
+function initDialog(dialogstatus: string, row: any) {
+  dialogVisible.value = true
+  if (dialogstatus === 'edit' || dialogstatus === 'detail') {
+    formData.value.id = row.id
+    formData.value.deptId = row.deptId // 所属单位id
+    formData.value.deptName = row.deptName // 所属单位
+    formData.value.riskName = row.riskName // 危险点名称
+    formData.value.address = row.address // 详细地址
+    formData.value.content = row.content // 作业活动概述
+    formData.value.nature = row.nature // 危险性质
+    formData.value.grade = row.grade // 等级
+    formData.value.assignPost = row.assignPost // 定岗
+    formData.value.staffQuota = Number(row.staffQuota) // 定员
+    formData.value.substancesQuantities = row.substancesQuantities // 危险物质及定量
+  }
+
+  // 详情隐藏表单校验
+  if (dialogstatus === 'detail') {
+    formDataRef.value?.clearValidate()
+  }
+  dialogStatus.value = dialogstatus // 类型 新建add 编辑edit 详情detail
+  btnLoading.value = false
+}
+
+// 关闭并刷新
+function closeRefresh() {
+  dialogVisible.value = false
+  resetForm()
+  emits('closeRefresh')
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible" :title="textMap[dialogStatus]" width="800" :before-close="closeRefresh" append-to-body
+    :open-delay="0" :close-on-click-modal="false"
+  >
+    <el-form
+      ref="formDataRef" :model="formData" :rules="rules" label-position="right" label-width="130px"
+      class="form-container" size="default" :disabled="dialogStatus === 'detail'" @submit.prevent
+    >
+      <el-row :gutter="10">
+        <el-col :span="12">
+          <el-form-item label="所属单位" prop="deptId">
+            <dept-select v-model="formData.deptId" placeholder="必选" :disabled="dialogStatus === 'detail'" :dept-show="true" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="危险源名称" prop="riskName">
+            <el-input :value="formData.riskName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="详细地址" prop="address">
+            <el-input :value="formData.address" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="作业活动概述" prop="content">
+            <el-input :value="formData.content" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="危险性质" prop="nature">
+            <el-input :value="formData.nature" :disabled="dialogStatus === 'detail'" type="text" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="等级" prop="grade">
+            <el-select
+              v-model="formData.grade"
+              placeholder="必选"
+              clearable
+              filterable
+              :disabled="dialogStatus === 'detail'"
+            >
+              <el-option v-for="item of deviceStatusList" :key="item.id" :label="item.name" :value="item.name "/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="定岗" prop="assignPost">
+            <el-input :value="formData.assignPost" :disabled="dialogStatus === 'detail'" type="text" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="定员" prop="staffQuota">
+            <el-input-number
+              v-model="formData.staffQuota" class="full-width-input"
+              :min="1" :precision="0" :step="1" placeholder="必填"
+              :disabled="dialogStatus === 'detail'"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="危险物质及定量" prop="substancesQuantities">
+            <el-input :value="formData.substancesQuantities" :disabled="dialogStatus === 'detail'" type="text" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button v-if="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button @click="closeRefresh">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//
+</style>
diff --git a/src/views/alarm/dangerAssessment/manage/list.vue b/src/views/alarm/dangerAssessment/manage/list.vue
index a1b6214..3e27450 100644
--- a/src/views/alarm/dangerAssessment/manage/list.vue
+++ b/src/views/alarm/dangerAssessment/manage/list.vue
@@ -5,61 +5,112 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IList, IListQuery } from './manage-interface'
 // import EditDialog from './editDialog.vue'
+import editPointDialog from './editPointDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { uploadApi } from '@/api/monitor/dev'
 import { getDictByCode } from '@/api/system/dict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { dictType } from '@/global'
+import { getDangerAssessmentManageList } from '@/api/alarm/dangerAssessment/manage'
 const { proxy } = getCurrentInstance() as any
 const editDialogRef = ref() // 组件
 const router = useRouter()
 // 文件上传input
 const fileRef = ref()
 const loading = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// ------------------------------------------------------------------------------------------
 // 默认查询条件
 const listQuery: Ref<IListQuery> = ref({
   area: '', // 所属区域
-  deptId: '', // 所属区域
-  dangerCategory: '', // 隐患分类
-  startTime: '', // 开始时间
-  endTime: '', // 结束时间
+  deptId: '', // 所属组织
+  riskName: '', // 危险点名称
+  riskType: '', // 危险点类型
   offset: 1,
   limit: 20,
 })
-// 表格表头
-const columns: Ref<TableColumn[]> = ref([
-  { text: '所属区域', value: 'area', align: 'center' },
+// ------------------------------------------表头---------------------------------------------
+const columns: Ref<TableColumn[]> = ref([]) // 表头
+// 危险点
+const columnsPoint: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '业务内容', value: 'businessContent', align: 'center' },
-  { text: '隐患分类Ⅰ', value: 'yhfl1', align: 'center' },
-  { text: '隐患分类Ⅱ', value: 'yhfl2', align: 'center' },
-  { text: '监控相机', value: 'equipmentName', align: 'center' },
-  { text: '录入时间', value: 'time', align: 'center' },
-  { text: '备注', value: 'remark', align: 'center' },
-])
+  { text: '危险点名称', value: 'riskName', align: 'center' },
+  { text: '详细地址', value: 'address', align: 'center' },
+  { text: '作业活动概述', value: 'content', align: 'center' },
+  { text: '危险性质', value: 'nature', align: 'center' },
+  { text: '等级', value: 'grade', align: 'center' },
+  { text: '定岗', value: 'assignPost', align: 'center' },
+  { text: '定员', value: 'staffQuota', align: 'center' },
+  { text: '危险物质及定量', value: 'substancesQuantities', align: 'center' },
+]
+// 重大危险源
+const columnsSource: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险源名称', value: 'businessContent', align: 'center' },
+  { text: '场所级别', value: 'yhfl1', align: 'center' },
+  { text: '危险化学品名称', value: 'yhfl2', align: 'center' },
+  { text: '危险性质', value: 'equipmentName', align: 'center' },
+  { text: '存量', value: 'time', align: 'center' },
+  { text: '临界量', value: 'remark', align: 'center' },
+  { text: '分级指数', value: 'remark', align: 'center' },
+  { text: '危险物质及定量', value: 'remark', align: 'center' },
+  { text: '危险源等级', value: 'remark', align: 'center' },
+]
+// 危险化学品场所
+const columnsChemistry: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险化学品场所', value: 'businessContent', align: 'center' },
+  { text: '场所分类', value: 'yhfl1', align: 'center' },
+  { text: '作业活动', value: 'yhfl2', align: 'center' },
+  { text: '危化品名称', value: 'equipmentName', align: 'center' },
+  { text: '危险性质', value: 'time', align: 'center' },
+  { text: '定岗', value: 'remark', align: 'center' },
+  { text: '定员', value: 'remark', align: 'center' },
+  { text: '定量', value: 'remark', align: 'center' },
+  { text: '定寿命', value: 'remark', align: 'center' },
+  { text: '定检', value: 'remark', align: 'center' },
+]
+// 危险作业
+const columnsWork: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险作业', value: 'businessContent', align: 'center' },
+  { text: '危险作业等级', value: 'yhfl1', align: 'center' },
+  { text: '主要危险描述', value: 'yhfl2', align: 'center' },
+  { text: '相关部门', value: 'equipmentName', align: 'center' },
+  { text: '作业频次', value: 'time', align: 'center' },
+]
+// 危险作业工序
+const columnsWorkProcesses: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险作业工序', value: 'businessContent', align: 'center' },
+  { text: '作业人员数量', value: 'yhfl1', align: 'center' },
+  { text: '事故类型', value: 'yhfl2', align: 'center' },
+]
+// -------------------------------------------------------------------------------------------
 const total = ref(0) // 数据条数
-const list = ref<IList[]>([]) // 数据条数
-const checkoutList = ref<IList[]>([]) // 数据条数
-// 开始结束时间
-const datetimerange = ref()
-watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
-  if (Array.isArray(newVal)) {
-    if (newVal.length) {
-      listQuery.value.startTime = `${newVal[0]} 00:00:00`
-      listQuery.value.endTime = `${newVal[1]} 23:59:59`
+const list = ref([]) // 数据条数
+const checkoutList = ref([]) // 数据条数
+
+const editPointDialogRef = ref() // 危险点ref
+// -----------------------------------------字典--------------------------------------------------------------
+// 查询字典
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('dangerAssessmentType')
+  // 制作右上角的菜单
+  const tempMenu = ['重大危险源', '危险点', '危险化学品场所', '危险作业', '危险作业工序']
+  tempMenu.forEach((item) => {
+    const tempFindData = res.data.find((e: { name: string; value: string }) => e.name === item)
+    if (tempFindData) {
+      menu.value.push({
+        name: tempFindData.name,
+        id: `${tempFindData.value}`,
+      })
     }
-  }
-})
-// ------------------------------------字典------------------------------------------
-// const statusList = ref<dictType[]>([]) // 在线状态
-const getDict = () => {
-  // // 在线状态
-  // getDictByCode('status').then((response) => {
-  //   statusList.value = response.data
-  // })
+  })
 }
-getDict()
 // -----------------------------------文件上传-------------------------------------------
 // 点击批量导入
 const batchImport = () => {
@@ -101,34 +152,12 @@
 // 查询数据
 const fetchData = () => {
   loading.value = true
-  // getDevListPage(listQuery).then((res: { data: { rows: []; total: number } }) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loading.value = false
-  // })
-  list.value = [{
-    id: '1',
-    area: '测试数据1', // 设备名称
-    deptName: '测试数据1', // 设备编号
-    businessContent: '测试数据1', // 所属单位
-    yhfl1: '测试数据1', // RTSP地址
-    yhfl2: '测试数据1', // 识别间隔
-    equipmentName: '测试数据1', // 告警间隔
-    time: '2021-11-11',
-    remark: '测试数据1', // 业务场景
-  },
-  {
-    id: '2',
-    area: '测试数据2', // 设备名称
-    deptName: '测试数据2', // 设备编号
-    businessContent: '测试数据2', // 所属单位
-    yhfl1: '测试数据2', // RTSP地址
-    yhfl2: '测试数据2', // 识别间隔
-    equipmentName: '测试数据2', // 告警间隔
-    time: '2022-09-08',
-    remark: '测试数据2', // 业务场景
-  },
-  ]
+  listQuery.value.riskType = active.value // 危险点类型
+  getDangerAssessmentManageList(listQuery.value).then((res: { data: { rows: []; total: number } }) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    loading.value = false
+  })
   loading.value = false
 }
 
@@ -136,14 +165,12 @@
 const reset = () => {
   listQuery.value = {
     area: '', // 所属区域
-    deptId: '', // 所属区域
-    dangerCategory: '', // 隐患分类
-    startTime: '', // 开始时间
-    endTime: '', // 结束时间
+    deptId: '', // 所属组织
+    riskName: '', // 危险点名称
+    riskType: '', // 危险点类型
     offset: 1,
     limit: 20,
   }
-  datetimerange.value = []
   fetchData()
 }
 
@@ -154,17 +181,57 @@
 
 // 新增
 const add = (row: IList) => {
-  ElMessage.info('敬请期待')
+  switch (active.value) {
+    case '1': // 危险点
+      editPointDialogRef.value.initDialog('add')
+      break
+    case '2': // 重大危险源
+      break
+    case '3': // 危险化学品场所
+      break
+    case '4': // 危险作业
+      break
+    case '5': // 危险作业工序
+      break
+  }
   // editDialogRef.value.initDialog('add')
 }
 // 详情
 const detail = (row: IList) => {
-  editDialogRef.value.initDialog('detail', row)
+  switch (active.value) {
+    case '1': // 危险点
+      editPointDialogRef.value.initDialog('detail', row)
+      break
+    case '2': // 重大危险源
+      break
+    case '3': // 危险化学品场所
+      break
+    case '4': // 危险作业
+      break
+    case '5': // 危险作业工序
+      break
+  }
+}
+// 编辑
+const edit = (row: IList) => {
+  switch (active.value) {
+    case '1': // 危险点
+      editPointDialogRef.value.initDialog('edit', row)
+      break
+    case '2': // 重大危险源
+      break
+    case '3': // 危险化学品场所
+      break
+    case '4': // 危险作业
+      break
+    case '5': // 危险作业工序
+      break
+  }
 }
 // 删除
 const del = (row: IList) => {
   ElMessageBox.confirm(
-    `确定要删除${row.equipmentName}吗？`,
+    '确定删除吗？',
     '确认删除',
     {
       confirmButtonText: '确定',
@@ -191,7 +258,39 @@
   fetchData()
 }
 
-onMounted(() => {
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  reset()
+}
+
+watch(() => active.value, (newValue) => {
+  console.log(newValue)
+  switch (newValue) {
+    case '1': // 危险点
+      columns.value = columnsPoint
+      break
+    case '2': // 重大危险源
+      columns.value = columnsSource
+      break
+    case '3': // 危险化学品场所
+      columns.value = columnsChemistry
+      break
+    case '4': // 危险作业
+      columns.value = columnsWork
+      break
+    case '5': // 危险作业工序
+      columns.value = columnsWorkProcesses
+      break
+    default:
+      columns.value = columnsPoint
+      break
+  }
+}, { immediate: true })
+
+onMounted(async () => {
+  await getDict()
+  active.value = '1'
   fetchData()
 })
 </script>
@@ -200,19 +299,10 @@
   <app-container>
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.area" placeholder="所属区域" clearable style="width: 200px;" @change="search" />
+        <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search" @changeDept="search"/>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search" />
-      </search-item>
-      <search-item>
-        <el-input v-model="listQuery.dangerCategory" placeholder="隐患分类" clearable style="width: 200px;" @change="search" />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
-          range-separator="至" start-placeholder="录入时间(开始)" end-placeholder="录入时间(结束)" @change="search"
-        />
+        <el-input v-model="listQuery.riskName" placeholder="危险点名称" clearable style="width: 200px;" />
       </search-item>
     </search-area>
     <table-container>
@@ -222,12 +312,22 @@
       </template>
       <input v-show="false" ref="fileRef" type="file" accept="xlsx/*" @change="onFileChange">
       <normal-table :query="listQuery" :list-loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" width="120" align="center">
+          <el-table-column label="操作" width="150" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" class="table-text-button" @click="detail(scope.row)">
                 详情
               </el-button>
+              <el-button type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
+                编辑
+              </el-button>
               <el-button type="danger" link size="small" class="table-text-button" @click="del(scope.row)">
                 删除
               </el-button>
@@ -237,5 +337,9 @@
       </normal-table>
     </table-container>
     <edit-dialog ref="editDialogRef" @close-refresh="search" />
+    <!-- 编辑危险点 -->
+    <edit-point-dialog ref="editPointDialogRef" />
+    <!-- 右上角按钮集合 -->
+    <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
   </app-container>
 </template>
diff --git a/src/views/alarm/dangerAssessment/manage/manage-interface.ts b/src/views/alarm/dangerAssessment/manage/manage-interface.ts
index e19c1be..3740441 100644
--- a/src/views/alarm/dangerAssessment/manage/manage-interface.ts
+++ b/src/views/alarm/dangerAssessment/manage/manage-interface.ts
@@ -1,9 +1,8 @@
 export interface IListQuery {
   area: string // 所属区域
-  deptId: string // 所属区域
-  dangerCategory: string // 隐患分类
-  startTime: string // 开始时间
-  endTime: string // 结束时间
+  deptId: string // 所属组织
+  riskName: string // 危险点名称
+  riskType: string // 危险点类型
   offset: number
   limit: number
 }
diff --git a/src/views/alarm/policyConfig/monitorPoint/drawArea.vue b/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
index e902322..6e72273 100644
--- a/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
@@ -1,4 +1,10 @@
 <script lang="ts" setup name="DrawArea">
+const props = defineProps({
+  dialogStatus: {
+    type: String,
+  },
+})
+const emits = defineEmits(['givePoints'])
 const points = ref([ // 标记点初始
   { x: 50, y: 50 }, // 左上
   { x: 150, y: 50 },
@@ -25,6 +31,9 @@
   }
 
   function drag(e: any, pointIndex: number) {
+    if (props.dialogStatus === 'detail') {
+      return
+    }
     e = e || window.event
     e.preventDefault()
     var mousePos = { x: e.clientX - canvas.getBoundingClientRect().left, y: e.clientY - canvas.getBoundingClientRect().top }
@@ -48,6 +57,9 @@
   }
 
   function addDragEvents() {
+    if (props.dialogStatus === 'detail') {
+      return
+    }
     var dragEvents = {
       dragStart(e: any) {
         e = e || window.event
@@ -98,6 +110,7 @@
 ])
 
 watch(() => points.value, () => {
+  emits('givePoints', points.value)
   style.value = [
     {
       top: `${points.value[0].y - 5}px`,
@@ -124,7 +137,7 @@
 <template>
   <div style="width: 400px;height: 300px;">
     <canvas id="myCanvas" width="400" height="300" class="canvans" />
-    <div v-for="(item, index) in points" :key="index" class="point" :style="style[index]" />
+    <div v-for="(item, index) in points" :key="index" :class="props.dialogStatus === 'detail' ? 'detail-point' : 'point'" :style="style[index]" />
   </div>
 </template>
 
@@ -158,4 +171,19 @@
     cursor: move;
   }
 }
+.detail-point {
+  width: 10px;
+  height: 10px;
+  position: absolute;
+  border-radius: 50%;
+  background-color: red;
+  opacity: 0.5;
+  top: 0;
+  left: 0;
+  z-index: 99;
+
+  &:hover {
+    cursor: not-allowed
+  }
+}
 </style>
diff --git a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
index 5a6a046..36618a7 100644
--- a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
@@ -4,13 +4,12 @@
 import { nextTick, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import type { IList as IEdgeDeviceList } from '../edgeDevice/edgeDevice-interface'
-import type { IList as ISceneList } from '../../library/scene/scene-interface'
-import type { IList as IAlgorithmList } from '../../library/algorithm/algorithm-interface'
 import type { IForm, IList } from './monitorPoint-interface'
 import drawArea from './drawArea.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { isIp } from '@/utils/validate'
-import { getDictByCode } from '@/api/system/dict'
+import { useCheckList } from '@/utils/useCheckList'
+import { getBoxList, getModelList, getRecognitionList, getSceneList, updateMonitorPoint } from '@/api/alarm/policyConfig/monitorPoint'
 const emits = defineEmits(['closeRefresh'])
 const dialogStatus = ref('add')
 const dialogVisible = ref(false) // 弹窗显示隐藏
@@ -24,121 +23,127 @@
 // 表单数据对象
 const formData: Ref<IForm> = ref({
   id: '',
-  edgeDevice: '', // 关联边缘设备
-  imageSaveInterval: 60, // 识别间隔
+  boxId: '', // 关联边缘设备id
+  deviceId: '', // 设备id
+  recognitionInterval: 60, // 识别间隔
   alarmInterval: 60, // 告警间隔
-  mode: '', // 场景模式
-  relationSceneName: '', // 业务场景
-  relationModelNames: '', // 报警对象/算法关联
-})
+  type: 1, // 场景模式
 
+  sceneId: '', // 业务场景id
+  algoModelId: '', // 模型id
+
+  recognitionUrl: '', // 识别流地址
+  rtspUrl: '', // rtsp地址
+  boundary: '', // 识别边界
+})
+const selectModelList = ref<any[]>([]) // 选择的算法
+const algorithmTableRef = ref()
 const btnLoading = ref(false) // 保存按钮加载状态
 const formDataRef = ref<FormInstance>() // 表单对象
-
-const isIpV = (rule: any, value: any, callback: any) => {
-  if (value === '') {
-    callback(new Error('ip地址必填!'))
-  }
-  else if (isIp(value)) {
-    callback()
-  }
-  else {
-    callback(new Error('IP不合法'))
-  }
-  callback()
-}
 // 校验规则
 const rules = reactive<FormRules>({
-  equipmentName: [{ required: true, message: '关联边缘设备必选', trigger: ['blur', 'change'] }],
-  imageSaveInterval: [{ required: true, message: '识别间隔必填', trigger: ['blur', 'change'] }],
+  boxId: [{ required: true, message: '关联边缘设备必选', trigger: ['blur', 'change'] }],
+  recognitionInterval: [{ required: true, message: '识别间隔必填', trigger: ['blur', 'change'] }],
   alarmInterval: [{ required: true, message: '告警间隔必填', trigger: ['blur', 'change'] }],
-  mode: [{ required: true, message: '场景模式必选', trigger: ['blur', 'change'] }],
-  relationSceneName: [{ required: true, message: '业务场景必选', trigger: ['blur', 'change'] }],
-  relationModelNames: [{ required: true, message: '报警对象必选', trigger: ['blur', 'change'] }],
+  type: [{ required: true, message: '场景模式必选', trigger: ['blur', 'change'] }],
+  sceneId: [{ required: true, message: '业务场景必选', trigger: ['blur', 'change'] }],
+  algoModelId: [{ required: true, message: '算法名称必选', trigger: ['blur', 'change'] }],
+  recognitionUrl: [{ required: true, message: '识别流地址必填', trigger: ['blur', 'change'] }],
+  rtspUrl: [{ required: true, message: 'rtsp地址必填', trigger: ['blur', 'change'] }],
 })
 
+// 算法表格表头
+const columns = ref<TableColumn[]>([
+  { text: '名称', value: 'recognitionTypeName', align: 'center', required: false },
+  { text: '置信度', value: 'confidenceLevel', align: 'center', required: true },
+  { text: '阈值', value: 'threshold', align: 'center', required: true },
+])
+
 // -------------------------------------------------------------------------------------------
-const edgeDeviceList = ref<IEdgeDeviceList[]>([]) // 边缘设备列表
-const sceneList = ref<ISceneList[]>([]) // 业务场景列表
-const algorithmList = ref<IAlgorithmList[]>([]) // 算法列表
+const edgeDeviceList: any = ref([]) // 边缘设备列表
+const sceneList: any = ref([]) // 业务场景列表
+const algorithmList: any = ref([]) // 算法列表
+const recognitionList: any = ref([]) // 报警对象列表
 // 获取边缘设备
 const fetchEdgeDeviceList = () => {
   const params = {
-    equipmentName: '', // 设备名称
-    status: '', // 在线状态
-    offset: 1,
-    limit: 999999,
+    boxName: '', // 设备名称
+    code: '', // 在线状态
+    deviceStatus: '', // 在线状态
   }
-  edgeDeviceList.value = [{
-    id: '1',
-    equipmentName: '测试数据1', // 设备名称
-    equipmentNo: '测试数据1', // 设备编号
-    area: '测试数据1', // 所属区域
-    deptName: '203', // 所属单位
-    ip: '1.0.0.0', // ip地址
-    status: '在线', // 在线状态
-  },
-  {
-    id: '2',
-    equipmentName: '测试数据2', // 设备名称
-    equipmentNo: '测试数据2', // 设备编号
-    area: '测试数据2', // 所属区域
-    deptName: '706', // 所属单位
-    ip: '1.0.0.1', // ip地址
-    status: '离线', // 在线状态
-  },
-  ]
+  getBoxList(params).then((res: any) => {
+    edgeDeviceList.value = res.data
+  })
+  console.log('获取边缘设备', edgeDeviceList.value)
 }
 
 // 获取业务场景列表
 const fetchSceneList = () => {
-  sceneList.value = [{
-    id: '1',
-    cjId: '测试数据场景id1',
-    name: '测试数据场景名称1',
-    version: 'V1.0',
-    desc: '测试数据场景描述',
-    status: '未使用',
-  },
-  {
-    id: '2',
-    cjId: '测试数据场景id2',
-    name: '测试数据场景名称2',
-    version: 'V2.0',
-    desc: '测试数据场景描述测试数据场景描述测试数据场景描述测试数据场景描述测试数据场景描述测试数据场景描述测试数据场景描述测试数据场景描述',
-    status: '使用中',
-  },
-  ]
+  const params = {
+    handleTask: '', // 任务标识
+    sceneCode: '', // 场景编码
+    sceneName: '', // 名称
+  }
+  getSceneList(params).then((res: any) => {
+    sceneList.value = res.data
+  })
 }
 
 // 获取算法列表
 const fetchAlgorithmList = () => {
-  algorithmList.value = [{
-    id: '1',
-    sfId: '测试数据算法id1',
-    name: '测试数据算法名称1',
-    version: 'V1.0',
-    desc: '测试数据算法描述',
-    status: '未使用',
-  },
-  {
-    id: '2',
-    sfId: '测试数据算法id2',
-    name: '测试数据算法名称2',
-    version: 'V2.0',
-    desc: '测试数据算法描述',
-    status: '使用中',
-  },
-  ]
+  const params = {
+    code: '', // 模型ID
+    modelName: '', // 名称
+  }
+  getModelList(params).then((res: any) => {
+    algorithmList.value = res.data
+  })
 }
 
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
+  if (`${formData.value.type}` === '0') { // 算法关联
+    if (!selectModelList.value.length) {
+      ElMessage.warning('请选择报警对象')
+      return false
+    }
+    if (!useCheckList(selectModelList.value, columns.value, '报警对象')) {
+      return false
+    }
+  }
   if (formDataRef.value) {
     formDataRef.value?.validate((valid: boolean) => {
       if (valid) {
-        ElMessage.info('敬请期待')
+        selectModelList.value.forEach((item: any) => {
+          const index = recognitionList.value.findIndex((i: { id: string }) => i.id === item.id)
+          if (index !== -1) {
+            recognitionList.value.splice(index, 1, { ...item, isUse: '1' })
+          }
+          else {
+            recognitionList.value.splice(index, 1, { ...item, isUse: '0' })
+          }
+        })
+        const params = {
+          ...formData.value,
+          sceneRelation: formData.value.type === 1 ? { id: formData.value.id, sceneId: formData.value.sceneId } : null,
+          // eslint-disable-next-line multiline-ternary
+          deviceModelRelations: formData.value.type === 0 ? recognitionList.value.map((item: any) => {
+            return {
+              ...item,
+              algoModelId: formData.value.algoModelId, // 算法模型id
+              confidenceLevel:	item.confidenceLevel, // 置信度
+              isUse: item.isUse,
+              recognitionTypeId:	item.recognitionTypeId, // 模型识别类型
+              threshold: item.threshold,	 // 阈值
+            }
+          }) : [],
+        }
+        console.log('要传的参数', params)
+        updateMonitorPoint(params).then(() => {
+          ElMessage.success('设置成功')
+          closeRefresh()
+        })
       }
     })
   }
@@ -148,26 +153,74 @@
 function resetForm() {
   formData.value = {
     id: '',
-    edgeDevice: '', // 关联边缘设备
-    imageSaveInterval: 60, // 识别间隔
+    boxId: '', // 关联边缘设备id
+    deviceId: '', // 设备id
+    recognitionInterval: 60, // 识别间隔
     alarmInterval: 60, // 告警间隔
-    mode: '', // 场景模式
-    relationSceneName: '', // 业务场景
-    relationModelNames: '', // 报警对象/算法关联
+    type: 1, // 场景模式
+
+    sceneId: '', // 业务场景id
+    algoModelId: '', // 模型id
+
+    recognitionUrl: '', // 识别流地址
+    rtspUrl: '', // rtsp地址
+    boundary: '', // 识别边界
   }
+  edgeDeviceList.value = [] // 边缘设备列表
+  sceneList.value = [] // 业务场景列表
+  algorithmList.value = [] // 算法列表
+  recognitionList.value = [] // 报警对象列表
 }
 
-// 选择的算法
-const selectModelList = ref<any[]>([])
 const selectModel = (value: any) => {
   selectModelList.value = value
-  formData.value.relationModelNames = value.map((item: any) => item.name).join(',')
 }
 
 // -----------------------------------初始化、关闭对话框相关-----------------------------------------
-function initDialog(dialogstatus: string, row: IList) {
-  dialogStatus.value = dialogstatus // 类型 新建add 编辑edit 详情detail
+function initDialog(dialogstatus: string, row: any) {
   dialogVisible.value = true
+  fetchEdgeDeviceList() // 获取边缘设备列表
+  fetchAlgorithmList() // 获取算法列表
+  fetchSceneList() // 业务场景列表
+  if (dialogstatus === 'edit' || dialogstatus === 'detail') {
+    formData.value.boxId = row.boxId // 边缘设备id
+    formData.value.recognitionInterval = row.recognitionInterval || 60 // 识别间隔
+    formData.value.alarmInterval = row.alarmInterval || 60 // 告警间隔
+    formData.value.type = row.type // 场景模式
+    formData.value.id = row.id // id
+    formData.value.deviceId = row.deviceId // 设备id
+    formData.value.recognitionUrl = row.recognitionUrl || 'http://192.168.83.42/recognitionUrl'// 识别流地址
+    formData.value.rtspUrl = row.rtspUrl || 'http://192.168.83.42/rtsp' // rtsp地址
+    // formData.value.boundary = formData.value.boundary ? JSON.parse(formData.value.boundary) : formData.value.boundary // 识别边界
+    if (`${row.type}` === '0') { // 算法关联
+      formData.value.algoModelId = row.deviceModelRelations && row.deviceModelRelations.length && row.deviceModelRelations[0].algoModelId // 模型id
+      recognitionList.value = row.deviceModelRelations.map((item: any) => {
+        return {
+          ...item,
+          confidenceLevel: `${item.confidenceLevel}` ? Number(item.confidenceLevel) : undefined,
+          threshold: `${item.threshold}` ? Number(item.threshold) : undefined,
+        }
+      })
+
+      // 恢复选中状态
+      const selectedRows = recognitionList.value.filter((item: any) => `${item.isUse}` === '1')
+      if (selectedRows && Array.isArray(selectedRows) && selectedRows.length) {
+        nextTick(() => {
+          selectedRows.forEach((row: any) => {
+            algorithmTableRef.value?.toggleRowSelection(row, true)
+          })
+        })
+      }
+    }
+    else if (`${row.type}` === '1') { // 业务场景
+      formData.value.sceneId = row.sceneRelation.sceneId
+    }
+  }
+
+  if (dialogstatus === 'detail') {
+    formDataRef.value?.clearValidate()
+  }
+  dialogStatus.value = dialogstatus // 类型 新建add 编辑edit 详情detail
   btnLoading.value = false
 }
 
@@ -177,57 +230,73 @@
   resetForm()
   emits('closeRefresh')
 }
-// 关闭弹窗
-function dialogClose() {
-  dialogVisible.value = false
-  resetForm()
-  closeRefresh()
+
+// 监听算法变化，查询算法报警对象
+const changeAlgoModelId = (newValue: string) => {
+  if (newValue) {
+    // 获取场景对象
+    const params = {
+      modelId: newValue, // 模型ID
+      typeCode: '', // 类型编码
+      typeName: '', // 类型名称
+    }
+    getRecognitionList(params).then((res) => {
+      recognitionList.value = res.data.map((item: { id: string; typeName: string }) => {
+        return {
+          ...item,
+          recognitionTypeName: item.typeName,
+          recognitionTypeId: item.id,
+          id: '',
+        }
+      })
+    })
+  }
 }
 
-onMounted(() => {
-  fetchEdgeDeviceList() // 获取边缘设备列表
-  fetchSceneList() // 业务场景列表
-  fetchAlgorithmList() // 获取算法列表
-})
+const givePoints = (value: any) => {
+  formData.value.boundary = JSON.stringify(value)
+}
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
 </script>
 
 <template>
   <el-dialog
-    v-model="dialogVisible" :title="textMap[dialogStatus]" width="1200" :before-close="dialogClose" append-to-body
+    v-model="dialogVisible" :title="textMap[dialogStatus]" width="800" :before-close="closeRefresh" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
     <el-row :gutter="30">
-      <el-col :span="15">
+      <el-col :span="24">
         <el-form
           ref="formDataRef" :model="formData" :rules="rules" label-position="right" label-width="130px"
-          class="form-container" size="default" @submit.prevent
+          class="form-container" size="default" :disabled="dialogStatus === 'detail'" @submit.prevent
         >
           <el-row :gutter="10">
             <el-col :span="24" class="grid-cell">
-              <el-form-item label="关联边缘设备" prop="equipmentName" class="required">
+              <el-form-item label="关联边缘设备" prop="boxId" class="required">
                 <el-select
-                  v-model="formData.edgeDevice"
+                  v-model="formData.boxId"
                   placeholder="关联边缘设备"
                   clearable
                   filterable
+                  :disabled="dialogStatus === 'detail'"
                 >
-                  <el-option v-for="item of edgeDeviceList" :key="item.id" :label="item.equipmentName" :value="item.id" >
+                  <el-option v-for="item of edgeDeviceList" :key="item.id" :label="item.boxName" :value="item.id">
                     <div style="display: flex;justify-content: space-between;">
-                      <span style="font-weight: 600;">{{ item.equipmentName }}</span>
-                      <span style="color: #8492a6; font-size: 13px">{{ item.area }}</span>
-                      <span style="color: #8492a6; font-size: 13px">{{ item.deptName }}</span>
+                      <span style="font-weight: 600;">{{ item.boxName }}</span>
+                      <span style="color: #8492a6; font-size: 13px" :style="{ color: `${item.deviceStatus}` === '0' ? '#0e932e' : '#979797' }">{{ `${item.deviceStatus}` === '0' ? '在线' : '离线' }}</span>
+                      <span style="color: #8492a6; font-size: 13px">{{ item.ip }}</span>
                     </div>
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="14">
-              <el-form-item label="识别间隔(s)" prop="imageSaveInterval">
+              <el-form-item label="识别间隔(s)" prop="recognitionInterval">
                 <el-input-number
-                  v-model="formData.imageSaveInterval" class="full-width-input"
+                  v-model="formData.recognitionInterval" class="full-width-input"
                   :min="1" :precision="0" :step="1" placeholder="必填"
+                  :disabled="dialogStatus === 'detail'"
                 />
               </el-form-item>
             </el-col>
@@ -236,34 +305,53 @@
                 <el-input-number
                   v-model="formData.alarmInterval" class="full-width-input"
                   :min="1" :precision="0" :step="1" placeholder="必填"
+                  :disabled="dialogStatus === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="14">
+              <el-form-item label="rtsp地址" prop="rtspUrl">
+                <el-input
+                  v-model="formData.rtspUrl" class="full-width-input"
+                  placeholder="必填"
+                  :disabled="dialogStatus === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="14">
+              <el-form-item label="识别流地址 " prop="recognitionUrl">
+                <el-input
+                  v-model="formData.recognitionUrl" class="full-width-input"
+                  placeholder="必填"
+                  :disabled="dialogStatus === 'detail'"
                 />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="24">
-              <el-form-item label="场景模式" prop="mode">
-                <el-radio-group v-model="formData.mode">
-                  <el-radio label="2">
+              <el-form-item label="场景模式" prop="type">
+                <el-radio-group v-model="formData.type" :disabled="dialogStatus === 'detail'">
+                  <el-radio :label="1">
                     业务场景
                   </el-radio>
-                  <el-radio label="1">
+                  <el-radio :label="0">
                     算法关联
                   </el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="formData.mode === '2'" :gutter="24">
+          <el-row v-if="formData.type === 1" :gutter="24">
             <el-col :span="24">
-              <el-form-item label="业务场景" prop="relationSceneName">
+              <el-form-item label="业务场景" prop="sceneId">
                 <el-select
-                  v-model="formData.relationSceneName" placeholder="业务场景" clearable class="select"
-                  style="width: 100%;"
+                  v-model="formData.sceneId" placeholder="业务场景" clearable class="select"
+                  style="width: 100%;" :disabled="dialogStatus === 'detail'"
                 >
-                  <el-option v-for="item in sceneList" :key="item.id" :value="item.name" :label="item.name">
+                  <el-option v-for="item in sceneList" :key="item.id" :value="item.id" :label="item.sceneName">
                     <div style="display: flex;justify-content: space-between;">
-                      <span style="font-weight: 600;">{{ item.name }}</span>
+                      <span style="font-weight: 600;">{{ item.sceneName }}</span>
                       <span style="color: #8492a6; font-size: 13px">{{ item.version }}</span>
                     </div>
                   </el-option>
@@ -271,54 +359,74 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="formData.mode === '1'" :gutter="24">
+          <el-row v-if="formData.type === 0" :gutter="24">
             <el-col :span="24">
-              <el-form-item label="算法关联" prop="relationModelNames">
+              <el-form-item label="算法名称" prop="algoModelId">
+                <el-select
+                  v-model="formData.algoModelId" placeholder="请选择算法" clearable class="select"
+                  style="width: 100%;" :disabled="dialogStatus === 'detail'"
+                  @change="changeAlgoModelId"
+                >
+                  <el-option v-for="item in algorithmList" :key="item.id" :value="item.id" :label="item.modelName">
+                    <div style="display: flex;justify-content: space-between;">
+                      <span style="font-weight: 600;">{{ item.modelName }}</span>
+                      <span style="color: #8492a6; font-size: 13px">{{ item.version }}</span>
+                    </div>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="formData.type === 0" :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="报警对象">
                 <el-table
-                  ref="multipleTableRef" :data="algorithmList" border stripe style="width: 100%;"
+                  ref="algorithmTableRef" :data="recognitionList" border stripe style="width: 100%;"
                   max-height="400px" @selection-change="selectModel"
                 >
-                  <el-table-column label="算法名称" align="center" value="name">
-                    <template #default="scope">
-                      {{ scope.row.name }}
+                  <el-table-column
+                    v-for="item in columns"
+                    :key="item.value"
+                    :prop="item.value"
+                    :label="item.text"
+                    align="center"
+                  >
+                    <template #header>
+                      <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
                     </template>
-                  </el-table-column>
-                  <el-table-column label="置信度" align="center">
                     <template #default="scope">
                       <el-input-number
-                        v-model="scope.row.customThreshold"
-                        :min="1"
-                        :precision="0.01"
+                        v-if="dialogStatus !== 'detail' && (item.value === 'confidenceLevel' || item.value === 'threshold')"
+                        v-model="scope.row[item.value]"
+                        :min="0"
+                        :precision="2"
                         controls-position="right"
                       />
+                      <!-- <el-input-number v-if="item.value === 'threshold'" v-model="scope.row[item.value]" controls-position="right" :min="0" /> -->
+                      <span v-else>{{ scope.row[item.value] }}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column label="阈值" align="center">
-                    <template #default="scope">
-                      <el-input-number v-model="scope.row.customThreshold" controls-position="right" :min="0" />
-                    </template>
-                  </el-table-column>
-                  <el-table-column type="selection" width="55" align="center" />
+                  <el-table-column :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
                 </el-table>
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
       </el-col>
-      <el-col :span="8">
+      <!-- <el-col :span="8">
         <span style="display: block;font-weight: 600; margin-bottom: 6px;font-size: 14px;">区域绘制</span>
         <div id="draw-area" class="draw">
-          <draw-area />
-          <span style="margin-top: 10px;font-size: 11px;color: red;">注意：请绘制出一个四边形</span>
+          <draw-area :dialog-status="dialogStatus" @givePoints="givePoints"/>
+          <span v-if="dialogStatus !== 'detail'" style="margin-top: 10px;font-size: 11px;color: red;">注意：请绘制出一个四边形</span>
         </div>
-      </el-col>
+      </el-col> -->
     </el-row>
     <template #footer>
-      <div v-show="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button :loading="btnLoading" type="primary" @click="submitForm">
+      <div class="dialog-footer">
+        <el-button v-if="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
-        <el-button @click="dialogClose">
+        <el-button @click="closeRefresh">
           取消
         </el-button>
       </div>

diff --git a/public/config/config.json b/public/config/config.json
index a85fc42..29161c3 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -10,5 +10,5 @@
   "maxZoom": "13",
   "zoom": "10",
   "timeGap": 3000,
-  "systemType": "sm"
+  "systemType": "gm"
 }
diff --git a/src/api/alarm/dangerAssessment/manage.ts b/src/api/alarm/dangerAssessment/manage.ts
new file mode 100644
index 0000000..dae1056
--- /dev/null
+++ b/src/api/alarm/dangerAssessment/manage.ts
@@ -0,0 +1,50 @@
+/**
+ * 安全生产隐患管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getDangerAssessmentManageList(data: any) {
+  return request({
+    url: 'risk/listPage',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 详情
+export function getDangerAssessmentManageDetail(data: { id: string }) {
+  return request({
+    url: 'risk/detail',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 新增
+export function addDangerAssessmentManage(data: object) {
+  return request({
+    url: 'risk/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateDangerAssessmentManage(data: object) {
+  return request({
+    url: 'risk/update',
+    method: 'post',
+    data,
+  })
+}
+
+// 批量导入
+export function batchImport(data: object) {
+  return request({
+    url: 'risk/batchImport',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/alarm/policyConfig/monitorPoint.ts b/src/api/alarm/policyConfig/monitorPoint.ts
new file mode 100644
index 0000000..e4cd648
--- /dev/null
+++ b/src/api/alarm/policyConfig/monitorPoint.ts
@@ -0,0 +1,68 @@
+/**
+ * 监控点位管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getMonitorPointList(data: any) {
+  return request({
+    url: 'device/relation/listPage',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 详情
+export function getMonitorPointDetail(data: { id: string }) {
+  return request({
+    url: 'device/relation/detail',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 编辑
+export function updateMonitorPoint(data: object) {
+  return request({
+    url: 'device/relation/update',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取盒子列表
+export function getBoxList(data: any) {
+  return request({
+    url: 'device/box/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 获取算法列表
+export function getModelList(data: any) {
+  return request({
+    url: 'device/model/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 获取算法-场景对象列表
+export function getSceneList(data: any) {
+  return request({
+    url: 'scene/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 算法报警对象
+export function getRecognitionList(data: any) {
+  return request({
+    url: 'device/recognitionType/recognitionList',
+    method: 'get',
+    params: data,
+  })
+}
+
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 04b39cc..92165e1 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -40,7 +40,7 @@
     default: 'default',
   }, // 输入框大小
 })
-const emit = defineEmits(['update:modelValue'])
+const emit = defineEmits(['update:modelValue', 'changeDept'])
 // ------------定义props参数----------
 const value = computed({
   get() {
@@ -153,6 +153,10 @@
     return []
   }
 }
+
+const changeDept = (val: any) => {
+  emit('changeDept', val)
+}
 // --------暴露方法
 defineExpose({ refreshTree, fetchDeptTree, findChildren })
 </script>
@@ -176,6 +180,7 @@
       filterable
       class="full-width-input"
       :disabled="props.disabled"
+      @change="changeDept"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index d1f5b24..e3d6460 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -8,5 +8,6 @@
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
   fixed?: boolean // 固定列
+  required?: boolean // 是否必填
 }
 
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
index 31a16b9..fb5f8ac 100644
--- a/src/utils/useCheckList.ts
+++ b/src/utils/useCheckList.ts
@@ -1,5 +1,4 @@
 import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 
 /**
  * 检查列表
@@ -7,13 +6,14 @@
  * @param columns // 表头信息
  * @param tableTitle // 表格名称
  */
-export function useCheckList(list: { [key: string]: string }[], columns: TableColumn, tableTitle = '') {
+export function useCheckList(list: { [key: string]: string }[], columns: any, tableTitle = '') {
   for (let index = 0; index < list.length; index++) {
     const item = list[index]
     for (const prop of columns) {
       // 检查必填
       if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        // ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        ElMessage.warning(`请先完善${tableTitle}中【${item.typeName}】的${prop.text}`)
         return false
       }
       // 验证正则
diff --git a/src/views/alarm/dangerAssessment/manage/editPointDialog.vue b/src/views/alarm/dangerAssessment/manage/editPointDialog.vue
new file mode 100644
index 0000000..db4b29f
--- /dev/null
+++ b/src/views/alarm/dangerAssessment/manage/editPointDialog.vue
@@ -0,0 +1,219 @@
+<!-- 新增、编辑危险点 -->
+<script lang="ts" setup name="EditPointDialog">
+import { reactive, ref } from 'vue'
+import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { addDangerAssessmentManage, updateDangerAssessmentManage } from '@/api/alarm/dangerAssessment/manage'
+const emits = defineEmits(['closeRefresh'])
+const dialogStatus = ref('add')
+const dialogVisible = ref(false) // 弹窗显示隐藏
+// 显示标题
+const textMap: { [key: string]: string } = {
+  detail: '详情',
+  edit: '编辑',
+  add: '新增',
+}
+
+// 表单数据对象
+const formData = ref({
+  id: '',
+  deptId: '', // 所属单位id
+  deptName: '', // 所属单位
+  riskName: '', // 危险点名称
+  address: '', // 详细地址
+  content: '', // 作业活动概述
+  nature: '', // 危险性质
+  grade: '', // 等级
+  assignPost: '', // 定岗
+  staffQuota: 1, // 定员
+  substancesQuantities: '', // 危险物质及定量
+})
+const btnLoading = ref(false) // 保存按钮加载状态
+const formDataRef = ref<FormInstance>() // 表单对象
+// 校验规则
+const rules = reactive<FormRules>({
+  deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
+  riskName: [{ required: true, message: '危险点名称必填', trigger: ['blur', 'change'] }],
+  address: [{ required: true, message: '详细地址必填', trigger: ['blur', 'change'] }],
+  content: [{ required: true, message: '作业活动概述必填', trigger: ['blur', 'change'] }],
+  nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
+  grade: [{ required: true, message: '等级必填', trigger: ['blur', 'change'] }],
+  assignPost: [{ required: true, message: '定岗必填', trigger: ['blur', 'change'] }],
+  staffQuota: [{ required: true, message: '定员必填', trigger: ['blur', 'change'] }],
+  substancesQuantities: [{ required: true, message: '危险物质及定量必填', trigger: ['blur', 'change'] }],
+})
+
+// -----------------------------------------字典--------------------------------------------------------------
+const deviceStatusList = ref<dictType[]>([]) // 危险点等级
+const getDict = async () => {
+  // 危险点等级
+  getDictByCode('dangerPointGrade').then((response) => {
+    deviceStatusList.value = response.data
+  })
+}
+getDict()
+// -------------------------------------------------------------------------------------------
+// 表单提交
+function submitForm() {
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.warning('新增危险点成功')
+            return false
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.warning('编辑危险点成功')
+            return false
+          })
+        }
+      }
+    })
+  }
+}
+
+// 重置表单
+function resetForm() {
+  formData.value = {
+    id: '',
+    deptId: '', // 所属单位id
+    deptName: '', // 所属单位
+    riskName: '', // 危险点名称
+    address: '', // 详细地址
+    content: '', // 作业活动概述
+    nature: '', // 危险性质
+    grade: '', // 等级
+    assignPost: '', // 定岗
+    staffQuota: 1, // 定员
+    substancesQuantities: '', // 危险物质及定量
+  }
+}
+
+// -----------------------------------初始化、关闭对话框相关-----------------------------------------
+function initDialog(dialogstatus: string, row: any) {
+  dialogVisible.value = true
+  if (dialogstatus === 'edit' || dialogstatus === 'detail') {
+    formData.value.id = row.id
+    formData.value.deptId = row.deptId // 所属单位id
+    formData.value.deptName = row.deptName // 所属单位
+    formData.value.riskName = row.riskName // 危险点名称
+    formData.value.address = row.address // 详细地址
+    formData.value.content = row.content // 作业活动概述
+    formData.value.nature = row.nature // 危险性质
+    formData.value.grade = row.grade // 等级
+    formData.value.assignPost = row.assignPost // 定岗
+    formData.value.staffQuota = Number(row.staffQuota) // 定员
+    formData.value.substancesQuantities = row.substancesQuantities // 危险物质及定量
+  }
+
+  // 详情隐藏表单校验
+  if (dialogstatus === 'detail') {
+    formDataRef.value?.clearValidate()
+  }
+  dialogStatus.value = dialogstatus // 类型 新建add 编辑edit 详情detail
+  btnLoading.value = false
+}
+
+// 关闭并刷新
+function closeRefresh() {
+  dialogVisible.value = false
+  resetForm()
+  emits('closeRefresh')
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible" :title="textMap[dialogStatus]" width="800" :before-close="closeRefresh" append-to-body
+    :open-delay="0" :close-on-click-modal="false"
+  >
+    <el-form
+      ref="formDataRef" :model="formData" :rules="rules" label-position="right" label-width="130px"
+      class="form-container" size="default" :disabled="dialogStatus === 'detail'" @submit.prevent
+    >
+      <el-row :gutter="10">
+        <el-col :span="12">
+          <el-form-item label="所属单位" prop="deptId">
+            <dept-select v-model="formData.deptId" placeholder="必选" :disabled="dialogStatus === 'detail'" :dept-show="true" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="危险源名称" prop="riskName">
+            <el-input :value="formData.riskName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="详细地址" prop="address">
+            <el-input :value="formData.address" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="作业活动概述" prop="content">
+            <el-input :value="formData.content" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="危险性质" prop="nature">
+            <el-input :value="formData.nature" :disabled="dialogStatus === 'detail'" type="text" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="等级" prop="grade">
+            <el-select
+              v-model="formData.grade"
+              placeholder="必选"
+              clearable
+              filterable
+              :disabled="dialogStatus === 'detail'"
+            >
+              <el-option v-for="item of deviceStatusList" :key="item.id" :label="item.name" :value="item.name "/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="定岗" prop="assignPost">
+            <el-input :value="formData.assignPost" :disabled="dialogStatus === 'detail'" type="text" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="定员" prop="staffQuota">
+            <el-input-number
+              v-model="formData.staffQuota" class="full-width-input"
+              :min="1" :precision="0" :step="1" placeholder="必填"
+              :disabled="dialogStatus === 'detail'"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="危险物质及定量" prop="substancesQuantities">
+            <el-input :value="formData.substancesQuantities" :disabled="dialogStatus === 'detail'" type="text" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button v-if="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button @click="closeRefresh">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//
+</style>
diff --git a/src/views/alarm/dangerAssessment/manage/list.vue b/src/views/alarm/dangerAssessment/manage/list.vue
index a1b6214..3e27450 100644
--- a/src/views/alarm/dangerAssessment/manage/list.vue
+++ b/src/views/alarm/dangerAssessment/manage/list.vue
@@ -5,61 +5,112 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IList, IListQuery } from './manage-interface'
 // import EditDialog from './editDialog.vue'
+import editPointDialog from './editPointDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { uploadApi } from '@/api/monitor/dev'
 import { getDictByCode } from '@/api/system/dict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { dictType } from '@/global'
+import { getDangerAssessmentManageList } from '@/api/alarm/dangerAssessment/manage'
 const { proxy } = getCurrentInstance() as any
 const editDialogRef = ref() // 组件
 const router = useRouter()
 // 文件上传input
 const fileRef = ref()
 const loading = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// ------------------------------------------------------------------------------------------
 // 默认查询条件
 const listQuery: Ref<IListQuery> = ref({
   area: '', // 所属区域
-  deptId: '', // 所属区域
-  dangerCategory: '', // 隐患分类
-  startTime: '', // 开始时间
-  endTime: '', // 结束时间
+  deptId: '', // 所属组织
+  riskName: '', // 危险点名称
+  riskType: '', // 危险点类型
   offset: 1,
   limit: 20,
 })
-// 表格表头
-const columns: Ref<TableColumn[]> = ref([
-  { text: '所属区域', value: 'area', align: 'center' },
+// ------------------------------------------表头---------------------------------------------
+const columns: Ref<TableColumn[]> = ref([]) // 表头
+// 危险点
+const columnsPoint: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '业务内容', value: 'businessContent', align: 'center' },
-  { text: '隐患分类Ⅰ', value: 'yhfl1', align: 'center' },
-  { text: '隐患分类Ⅱ', value: 'yhfl2', align: 'center' },
-  { text: '监控相机', value: 'equipmentName', align: 'center' },
-  { text: '录入时间', value: 'time', align: 'center' },
-  { text: '备注', value: 'remark', align: 'center' },
-])
+  { text: '危险点名称', value: 'riskName', align: 'center' },
+  { text: '详细地址', value: 'address', align: 'center' },
+  { text: '作业活动概述', value: 'content', align: 'center' },
+  { text: '危险性质', value: 'nature', align: 'center' },
+  { text: '等级', value: 'grade', align: 'center' },
+  { text: '定岗', value: 'assignPost', align: 'center' },
+  { text: '定员', value: 'staffQuota', align: 'center' },
+  { text: '危险物质及定量', value: 'substancesQuantities', align: 'center' },
+]
+// 重大危险源
+const columnsSource: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险源名称', value: 'businessContent', align: 'center' },
+  { text: '场所级别', value: 'yhfl1', align: 'center' },
+  { text: '危险化学品名称', value: 'yhfl2', align: 'center' },
+  { text: '危险性质', value: 'equipmentName', align: 'center' },
+  { text: '存量', value: 'time', align: 'center' },
+  { text: '临界量', value: 'remark', align: 'center' },
+  { text: '分级指数', value: 'remark', align: 'center' },
+  { text: '危险物质及定量', value: 'remark', align: 'center' },
+  { text: '危险源等级', value: 'remark', align: 'center' },
+]
+// 危险化学品场所
+const columnsChemistry: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险化学品场所', value: 'businessContent', align: 'center' },
+  { text: '场所分类', value: 'yhfl1', align: 'center' },
+  { text: '作业活动', value: 'yhfl2', align: 'center' },
+  { text: '危化品名称', value: 'equipmentName', align: 'center' },
+  { text: '危险性质', value: 'time', align: 'center' },
+  { text: '定岗', value: 'remark', align: 'center' },
+  { text: '定员', value: 'remark', align: 'center' },
+  { text: '定量', value: 'remark', align: 'center' },
+  { text: '定寿命', value: 'remark', align: 'center' },
+  { text: '定检', value: 'remark', align: 'center' },
+]
+// 危险作业
+const columnsWork: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险作业', value: 'businessContent', align: 'center' },
+  { text: '危险作业等级', value: 'yhfl1', align: 'center' },
+  { text: '主要危险描述', value: 'yhfl2', align: 'center' },
+  { text: '相关部门', value: 'equipmentName', align: 'center' },
+  { text: '作业频次', value: 'time', align: 'center' },
+]
+// 危险作业工序
+const columnsWorkProcesses: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险作业工序', value: 'businessContent', align: 'center' },
+  { text: '作业人员数量', value: 'yhfl1', align: 'center' },
+  { text: '事故类型', value: 'yhfl2', align: 'center' },
+]
+// -------------------------------------------------------------------------------------------
 const total = ref(0) // 数据条数
-const list = ref<IList[]>([]) // 数据条数
-const checkoutList = ref<IList[]>([]) // 数据条数
-// 开始结束时间
-const datetimerange = ref()
-watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
-  if (Array.isArray(newVal)) {
-    if (newVal.length) {
-      listQuery.value.startTime = `${newVal[0]} 00:00:00`
-      listQuery.value.endTime = `${newVal[1]} 23:59:59`
+const list = ref([]) // 数据条数
+const checkoutList = ref([]) // 数据条数
+
+const editPointDialogRef = ref() // 危险点ref
+// -----------------------------------------字典--------------------------------------------------------------
+// 查询字典
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('dangerAssessmentType')
+  // 制作右上角的菜单
+  const tempMenu = ['重大危险源', '危险点', '危险化学品场所', '危险作业', '危险作业工序']
+  tempMenu.forEach((item) => {
+    const tempFindData = res.data.find((e: { name: string; value: string }) => e.name === item)
+    if (tempFindData) {
+      menu.value.push({
+        name: tempFindData.name,
+        id: `${tempFindData.value}`,
+      })
     }
-  }
-})
-// ------------------------------------字典------------------------------------------
-// const statusList = ref<dictType[]>([]) // 在线状态
-const getDict = () => {
-  // // 在线状态
-  // getDictByCode('status').then((response) => {
-  //   statusList.value = response.data
-  // })
+  })
 }
-getDict()
 // -----------------------------------文件上传-------------------------------------------
 // 点击批量导入
 const batchImport = () => {
@@ -101,34 +152,12 @@
 // 查询数据
 const fetchData = () => {
   loading.value = true
-  // getDevListPage(listQuery).then((res: { data: { rows: []; total: number } }) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loading.value = false
-  // })
-  list.value = [{
-    id: '1',
-    area: '测试数据1', // 设备名称
-    deptName: '测试数据1', // 设备编号
-    businessContent: '测试数据1', // 所属单位
-    yhfl1: '测试数据1', // RTSP地址
-    yhfl2: '测试数据1', // 识别间隔
-    equipmentName: '测试数据1', // 告警间隔
-    time: '2021-11-11',
-    remark: '测试数据1', // 业务场景
-  },
-  {
-    id: '2',
-    area: '测试数据2', // 设备名称
-    deptName: '测试数据2', // 设备编号
-    businessContent: '测试数据2', // 所属单位
-    yhfl1: '测试数据2', // RTSP地址
-    yhfl2: '测试数据2', // 识别间隔
-    equipmentName: '测试数据2', // 告警间隔
-    time: '2022-09-08',
-    remark: '测试数据2', // 业务场景
-  },
-  ]
+  listQuery.value.riskType = active.value // 危险点类型
+  getDangerAssessmentManageList(listQuery.value).then((res: { data: { rows: []; total: number } }) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    loading.value = false
+  })
   loading.value = false
 }
 
@@ -136,14 +165,12 @@
 const reset = () => {
   listQuery.value = {
     area: '', // 所属区域
-    deptId: '', // 所属区域
-    dangerCategory: '', // 隐患分类
-    startTime: '', // 开始时间
-    endTime: '', // 结束时间
+    deptId: '', // 所属组织
+    riskName: '', // 危险点名称
+    riskType: '', // 危险点类型
     offset: 1,
     limit: 20,
   }
-  datetimerange.value = []
   fetchData()
 }
 
@@ -154,17 +181,57 @@
 
 // 新增
 const add = (row: IList) => {
-  ElMessage.info('敬请期待')
+  switch (active.value) {
+    case '1': // 危险点
+      editPointDialogRef.value.initDialog('add')
+      break
+    case '2': // 重大危险源
+      break
+    case '3': // 危险化学品场所
+      break
+    case '4': // 危险作业
+      break
+    case '5': // 危险作业工序
+      break
+  }
   // editDialogRef.value.initDialog('add')
 }
 // 详情
 const detail = (row: IList) => {
-  editDialogRef.value.initDialog('detail', row)
+  switch (active.value) {
+    case '1': // 危险点
+      editPointDialogRef.value.initDialog('detail', row)
+      break
+    case '2': // 重大危险源
+      break
+    case '3': // 危险化学品场所
+      break
+    case '4': // 危险作业
+      break
+    case '5': // 危险作业工序
+      break
+  }
+}
+// 编辑
+const edit = (row: IList) => {
+  switch (active.value) {
+    case '1': // 危险点
+      editPointDialogRef.value.initDialog('edit', row)
+      break
+    case '2': // 重大危险源
+      break
+    case '3': // 危险化学品场所
+      break
+    case '4': // 危险作业
+      break
+    case '5': // 危险作业工序
+      break
+  }
 }
 // 删除
 const del = (row: IList) => {
   ElMessageBox.confirm(
-    `确定要删除${row.equipmentName}吗？`,
+    '确定删除吗？',
     '确认删除',
     {
       confirmButtonText: '确定',
@@ -191,7 +258,39 @@
   fetchData()
 }
 
-onMounted(() => {
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  reset()
+}
+
+watch(() => active.value, (newValue) => {
+  console.log(newValue)
+  switch (newValue) {
+    case '1': // 危险点
+      columns.value = columnsPoint
+      break
+    case '2': // 重大危险源
+      columns.value = columnsSource
+      break
+    case '3': // 危险化学品场所
+      columns.value = columnsChemistry
+      break
+    case '4': // 危险作业
+      columns.value = columnsWork
+      break
+    case '5': // 危险作业工序
+      columns.value = columnsWorkProcesses
+      break
+    default:
+      columns.value = columnsPoint
+      break
+  }
+}, { immediate: true })
+
+onMounted(async () => {
+  await getDict()
+  active.value = '1'
   fetchData()
 })
 </script>
@@ -200,19 +299,10 @@
   <app-container>
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.area" placeholder="所属区域" clearable style="width: 200px;" @change="search" />
+        <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search" @changeDept="search"/>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search" />
-      </search-item>
-      <search-item>
-        <el-input v-model="listQuery.dangerCategory" placeholder="隐患分类" clearable style="width: 200px;" @change="search" />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
-          range-separator="至" start-placeholder="录入时间(开始)" end-placeholder="录入时间(结束)" @change="search"
-        />
+        <el-input v-model="listQuery.riskName" placeholder="危险点名称" clearable style="width: 200px;" />
       </search-item>
     </search-area>
     <table-container>
@@ -222,12 +312,22 @@
       </template>
       <input v-show="false" ref="fileRef" type="file" accept="xlsx/*" @change="onFileChange">
       <normal-table :query="listQuery" :list-loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" width="120" align="center">
+          <el-table-column label="操作" width="150" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" class="table-text-button" @click="detail(scope.row)">
                 详情
               </el-button>
+              <el-button type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
+                编辑
+              </el-button>
               <el-button type="danger" link size="small" class="table-text-button" @click="del(scope.row)">
                 删除
               </el-button>
@@ -237,5 +337,9 @@
       </normal-table>
     </table-container>
     <edit-dialog ref="editDialogRef" @close-refresh="search" />
+    <!-- 编辑危险点 -->
+    <edit-point-dialog ref="editPointDialogRef" />
+    <!-- 右上角按钮集合 -->
+    <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
   </app-container>
 </template>
diff --git a/src/views/alarm/dangerAssessment/manage/manage-interface.ts b/src/views/alarm/dangerAssessment/manage/manage-interface.ts
index e19c1be..3740441 100644
--- a/src/views/alarm/dangerAssessment/manage/manage-interface.ts
+++ b/src/views/alarm/dangerAssessment/manage/manage-interface.ts
@@ -1,9 +1,8 @@
 export interface IListQuery {
   area: string // 所属区域
-  deptId: string // 所属区域
-  dangerCategory: string // 隐患分类
-  startTime: string // 开始时间
-  endTime: string // 结束时间
+  deptId: string // 所属组织
+  riskName: string // 危险点名称
+  riskType: string // 危险点类型
   offset: number
   limit: number
 }
diff --git a/src/views/alarm/policyConfig/monitorPoint/drawArea.vue b/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
index e902322..6e72273 100644
--- a/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
@@ -1,4 +1,10 @@
 <script lang="ts" setup name="DrawArea">
+const props = defineProps({
+  dialogStatus: {
+    type: String,
+  },
+})
+const emits = defineEmits(['givePoints'])
 const points = ref([ // 标记点初始
   { x: 50, y: 50 }, // 左上
   { x: 150, y: 50 },
@@ -25,6 +31,9 @@
   }
 
   function drag(e: any, pointIndex: number) {
+    if (props.dialogStatus === 'detail') {
+      return
+    }
     e = e || window.event
     e.preventDefault()
     var mousePos = { x: e.clientX - canvas.getBoundingClientRect().left, y: e.clientY - canvas.getBoundingClientRect().top }
@@ -48,6 +57,9 @@
   }
 
   function addDragEvents() {
+    if (props.dialogStatus === 'detail') {
+      return
+    }
     var dragEvents = {
       dragStart(e: any) {
         e = e || window.event
@@ -98,6 +110,7 @@
 ])
 
 watch(() => points.value, () => {
+  emits('givePoints', points.value)
   style.value = [
     {
       top: `${points.value[0].y - 5}px`,
@@ -124,7 +137,7 @@
 <template>
   <div style="width: 400px;height: 300px;">
     <canvas id="myCanvas" width="400" height="300" class="canvans" />
-    <div v-for="(item, index) in points" :key="index" class="point" :style="style[index]" />
+    <div v-for="(item, index) in points" :key="index" :class="props.dialogStatus === 'detail' ? 'detail-point' : 'point'" :style="style[index]" />
   </div>
 </template>
 
@@ -158,4 +171,19 @@
     cursor: move;
   }
 }
+.detail-point {
+  width: 10px;
+  height: 10px;
+  position: absolute;
+  border-radius: 50%;
+  background-color: red;
+  opacity: 0.5;
+  top: 0;
+  left: 0;
+  z-index: 99;
+
+  &:hover {
+    cursor: not-allowed
+  }
+}
 </style>
diff --git a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
index 5a6a046..36618a7 100644
--- a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
@@ -4,13 +4,12 @@
 import { nextTick, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import type { IList as IEdgeDeviceList } from '../edgeDevice/edgeDevice-interface'
-import type { IList as ISceneList } from '../../library/scene/scene-interface'
-import type { IList as IAlgorithmList } from '../../library/algorithm/algorithm-interface'
 import type { IForm, IList } from './monitorPoint-interface'
 import drawArea from './drawArea.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { isIp } from '@/utils/validate'
-import { getDictByCode } from '@/api/system/dict'
+import { useCheckList } from '@/utils/useCheckList'
+import { getBoxList, getModelList, getRecognitionList, getSceneList, updateMonitorPoint } from '@/api/alarm/policyConfig/monitorPoint'
 const emits = defineEmits(['closeRefresh'])
 const dialogStatus = ref('add')
 const dialogVisible = ref(false) // 弹窗显示隐藏
@@ -24,121 +23,127 @@
 // 表单数据对象
 const formData: Ref<IForm> = ref({
   id: '',
-  edgeDevice: '', // 关联边缘设备
-  imageSaveInterval: 60, // 识别间隔
+  boxId: '', // 关联边缘设备id
+  deviceId: '', // 设备id
+  recognitionInterval: 60, // 识别间隔
   alarmInterval: 60, // 告警间隔
-  mode: '', // 场景模式
-  relationSceneName: '', // 业务场景
-  relationModelNames: '', // 报警对象/算法关联
-})
+  type: 1, // 场景模式
 
+  sceneId: '', // 业务场景id
+  algoModelId: '', // 模型id
+
+  recognitionUrl: '', // 识别流地址
+  rtspUrl: '', // rtsp地址
+  boundary: '', // 识别边界
+})
+const selectModelList = ref<any[]>([]) // 选择的算法
+const algorithmTableRef = ref()
 const btnLoading = ref(false) // 保存按钮加载状态
 const formDataRef = ref<FormInstance>() // 表单对象
-
-const isIpV = (rule: any, value: any, callback: any) => {
-  if (value === '') {
-    callback(new Error('ip地址必填!'))
-  }
-  else if (isIp(value)) {
-    callback()
-  }
-  else {
-    callback(new Error('IP不合法'))
-  }
-  callback()
-}
 // 校验规则
 const rules = reactive<FormRules>({
-  equipmentName: [{ required: true, message: '关联边缘设备必选', trigger: ['blur', 'change'] }],
-  imageSaveInterval: [{ required: true, message: '识别间隔必填', trigger: ['blur', 'change'] }],
+  boxId: [{ required: true, message: '关联边缘设备必选', trigger: ['blur', 'change'] }],
+  recognitionInterval: [{ required: true, message: '识别间隔必填', trigger: ['blur', 'change'] }],
   alarmInterval: [{ required: true, message: '告警间隔必填', trigger: ['blur', 'change'] }],
-  mode: [{ required: true, message: '场景模式必选', trigger: ['blur', 'change'] }],
-  relationSceneName: [{ required: true, message: '业务场景必选', trigger: ['blur', 'change'] }],
-  relationModelNames: [{ required: true, message: '报警对象必选', trigger: ['blur', 'change'] }],
+  type: [{ required: true, message: '场景模式必选', trigger: ['blur', 'change'] }],
+  sceneId: [{ required: true, message: '业务场景必选', trigger: ['blur', 'change'] }],
+  algoModelId: [{ required: true, message: '算法名称必选', trigger: ['blur', 'change'] }],
+  recognitionUrl: [{ required: true, message: '识别流地址必填', trigger: ['blur', 'change'] }],
+  rtspUrl: [{ required: true, message: 'rtsp地址必填', trigger: ['blur', 'change'] }],
 })
 
+// 算法表格表头
+const columns = ref<TableColumn[]>([
+  { text: '名称', value: 'recognitionTypeName', align: 'center', required: false },
+  { text: '置信度', value: 'confidenceLevel', align: 'center', required: true },
+  { text: '阈值', value: 'threshold', align: 'center', required: true },
+])
+
 // -------------------------------------------------------------------------------------------
-const edgeDeviceList = ref<IEdgeDeviceList[]>([]) // 边缘设备列表
-const sceneList = ref<ISceneList[]>([]) // 业务场景列表
-const algorithmList = ref<IAlgorithmList[]>([]) // 算法列表
+const edgeDeviceList: any = ref([]) // 边缘设备列表
+const sceneList: any = ref([]) // 业务场景列表
+const algorithmList: any = ref([]) // 算法列表
+const recognitionList: any = ref([]) // 报警对象列表
 // 获取边缘设备
 const fetchEdgeDeviceList = () => {
   const params = {
-    equipmentName: '', // 设备名称
-    status: '', // 在线状态
-    offset: 1,
-    limit: 999999,
+    boxName: '', // 设备名称
+    code: '', // 在线状态
+    deviceStatus: '', // 在线状态
   }
-  edgeDeviceList.value = [{
-    id: '1',
-    equipmentName: '测试数据1', // 设备名称
-    equipmentNo: '测试数据1', // 设备编号
-    area: '测试数据1', // 所属区域
-    deptName: '203', // 所属单位
-    ip: '1.0.0.0', // ip地址
-    status: '在线', // 在线状态
-  },
-  {
-    id: '2',
-    equipmentName: '测试数据2', // 设备名称
-    equipmentNo: '测试数据2', // 设备编号
-    area: '测试数据2', // 所属区域
-    deptName: '706', // 所属单位
-    ip: '1.0.0.1', // ip地址
-    status: '离线', // 在线状态
-  },
-  ]
+  getBoxList(params).then((res: any) => {
+    edgeDeviceList.value = res.data
+  })
+  console.log('获取边缘设备', edgeDeviceList.value)
 }
 
 // 获取业务场景列表
 const fetchSceneList = () => {
-  sceneList.value = [{
-    id: '1',
-    cjId: '测试数据场景id1',
-    name: '测试数据场景名称1',
-    version: 'V1.0',
-    desc: '测试数据场景描述',
-    status: '未使用',
-  },
-  {
-    id: '2',
-    cjId: '测试数据场景id2',
-    name: '测试数据场景名称2',
-    version: 'V2.0',
-    desc: '测试数据场景描述测试数据场景描述测试数据场景描述测试数据场景描述测试数据场景描述测试数据场景描述测试数据场景描述测试数据场景描述',
-    status: '使用中',
-  },
-  ]
+  const params = {
+    handleTask: '', // 任务标识
+    sceneCode: '', // 场景编码
+    sceneName: '', // 名称
+  }
+  getSceneList(params).then((res: any) => {
+    sceneList.value = res.data
+  })
 }
 
 // 获取算法列表
 const fetchAlgorithmList = () => {
-  algorithmList.value = [{
-    id: '1',
-    sfId: '测试数据算法id1',
-    name: '测试数据算法名称1',
-    version: 'V1.0',
-    desc: '测试数据算法描述',
-    status: '未使用',
-  },
-  {
-    id: '2',
-    sfId: '测试数据算法id2',
-    name: '测试数据算法名称2',
-    version: 'V2.0',
-    desc: '测试数据算法描述',
-    status: '使用中',
-  },
-  ]
+  const params = {
+    code: '', // 模型ID
+    modelName: '', // 名称
+  }
+  getModelList(params).then((res: any) => {
+    algorithmList.value = res.data
+  })
 }
 
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
+  if (`${formData.value.type}` === '0') { // 算法关联
+    if (!selectModelList.value.length) {
+      ElMessage.warning('请选择报警对象')
+      return false
+    }
+    if (!useCheckList(selectModelList.value, columns.value, '报警对象')) {
+      return false
+    }
+  }
   if (formDataRef.value) {
     formDataRef.value?.validate((valid: boolean) => {
       if (valid) {
-        ElMessage.info('敬请期待')
+        selectModelList.value.forEach((item: any) => {
+          const index = recognitionList.value.findIndex((i: { id: string }) => i.id === item.id)
+          if (index !== -1) {
+            recognitionList.value.splice(index, 1, { ...item, isUse: '1' })
+          }
+          else {
+            recognitionList.value.splice(index, 1, { ...item, isUse: '0' })
+          }
+        })
+        const params = {
+          ...formData.value,
+          sceneRelation: formData.value.type === 1 ? { id: formData.value.id, sceneId: formData.value.sceneId } : null,
+          // eslint-disable-next-line multiline-ternary
+          deviceModelRelations: formData.value.type === 0 ? recognitionList.value.map((item: any) => {
+            return {
+              ...item,
+              algoModelId: formData.value.algoModelId, // 算法模型id
+              confidenceLevel:	item.confidenceLevel, // 置信度
+              isUse: item.isUse,
+              recognitionTypeId:	item.recognitionTypeId, // 模型识别类型
+              threshold: item.threshold,	 // 阈值
+            }
+          }) : [],
+        }
+        console.log('要传的参数', params)
+        updateMonitorPoint(params).then(() => {
+          ElMessage.success('设置成功')
+          closeRefresh()
+        })
       }
     })
   }
@@ -148,26 +153,74 @@
 function resetForm() {
   formData.value = {
     id: '',
-    edgeDevice: '', // 关联边缘设备
-    imageSaveInterval: 60, // 识别间隔
+    boxId: '', // 关联边缘设备id
+    deviceId: '', // 设备id
+    recognitionInterval: 60, // 识别间隔
     alarmInterval: 60, // 告警间隔
-    mode: '', // 场景模式
-    relationSceneName: '', // 业务场景
-    relationModelNames: '', // 报警对象/算法关联
+    type: 1, // 场景模式
+
+    sceneId: '', // 业务场景id
+    algoModelId: '', // 模型id
+
+    recognitionUrl: '', // 识别流地址
+    rtspUrl: '', // rtsp地址
+    boundary: '', // 识别边界
   }
+  edgeDeviceList.value = [] // 边缘设备列表
+  sceneList.value = [] // 业务场景列表
+  algorithmList.value = [] // 算法列表
+  recognitionList.value = [] // 报警对象列表
 }
 
-// 选择的算法
-const selectModelList = ref<any[]>([])
 const selectModel = (value: any) => {
   selectModelList.value = value
-  formData.value.relationModelNames = value.map((item: any) => item.name).join(',')
 }
 
 // -----------------------------------初始化、关闭对话框相关-----------------------------------------
-function initDialog(dialogstatus: string, row: IList) {
-  dialogStatus.value = dialogstatus // 类型 新建add 编辑edit 详情detail
+function initDialog(dialogstatus: string, row: any) {
   dialogVisible.value = true
+  fetchEdgeDeviceList() // 获取边缘设备列表
+  fetchAlgorithmList() // 获取算法列表
+  fetchSceneList() // 业务场景列表
+  if (dialogstatus === 'edit' || dialogstatus === 'detail') {
+    formData.value.boxId = row.boxId // 边缘设备id
+    formData.value.recognitionInterval = row.recognitionInterval || 60 // 识别间隔
+    formData.value.alarmInterval = row.alarmInterval || 60 // 告警间隔
+    formData.value.type = row.type // 场景模式
+    formData.value.id = row.id // id
+    formData.value.deviceId = row.deviceId // 设备id
+    formData.value.recognitionUrl = row.recognitionUrl || 'http://192.168.83.42/recognitionUrl'// 识别流地址
+    formData.value.rtspUrl = row.rtspUrl || 'http://192.168.83.42/rtsp' // rtsp地址
+    // formData.value.boundary = formData.value.boundary ? JSON.parse(formData.value.boundary) : formData.value.boundary // 识别边界
+    if (`${row.type}` === '0') { // 算法关联
+      formData.value.algoModelId = row.deviceModelRelations && row.deviceModelRelations.length && row.deviceModelRelations[0].algoModelId // 模型id
+      recognitionList.value = row.deviceModelRelations.map((item: any) => {
+        return {
+          ...item,
+          confidenceLevel: `${item.confidenceLevel}` ? Number(item.confidenceLevel) : undefined,
+          threshold: `${item.threshold}` ? Number(item.threshold) : undefined,
+        }
+      })
+
+      // 恢复选中状态
+      const selectedRows = recognitionList.value.filter((item: any) => `${item.isUse}` === '1')
+      if (selectedRows && Array.isArray(selectedRows) && selectedRows.length) {
+        nextTick(() => {
+          selectedRows.forEach((row: any) => {
+            algorithmTableRef.value?.toggleRowSelection(row, true)
+          })
+        })
+      }
+    }
+    else if (`${row.type}` === '1') { // 业务场景
+      formData.value.sceneId = row.sceneRelation.sceneId
+    }
+  }
+
+  if (dialogstatus === 'detail') {
+    formDataRef.value?.clearValidate()
+  }
+  dialogStatus.value = dialogstatus // 类型 新建add 编辑edit 详情detail
   btnLoading.value = false
 }
 
@@ -177,57 +230,73 @@
   resetForm()
   emits('closeRefresh')
 }
-// 关闭弹窗
-function dialogClose() {
-  dialogVisible.value = false
-  resetForm()
-  closeRefresh()
+
+// 监听算法变化，查询算法报警对象
+const changeAlgoModelId = (newValue: string) => {
+  if (newValue) {
+    // 获取场景对象
+    const params = {
+      modelId: newValue, // 模型ID
+      typeCode: '', // 类型编码
+      typeName: '', // 类型名称
+    }
+    getRecognitionList(params).then((res) => {
+      recognitionList.value = res.data.map((item: { id: string; typeName: string }) => {
+        return {
+          ...item,
+          recognitionTypeName: item.typeName,
+          recognitionTypeId: item.id,
+          id: '',
+        }
+      })
+    })
+  }
 }
 
-onMounted(() => {
-  fetchEdgeDeviceList() // 获取边缘设备列表
-  fetchSceneList() // 业务场景列表
-  fetchAlgorithmList() // 获取算法列表
-})
+const givePoints = (value: any) => {
+  formData.value.boundary = JSON.stringify(value)
+}
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
 </script>
 
 <template>
   <el-dialog
-    v-model="dialogVisible" :title="textMap[dialogStatus]" width="1200" :before-close="dialogClose" append-to-body
+    v-model="dialogVisible" :title="textMap[dialogStatus]" width="800" :before-close="closeRefresh" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
     <el-row :gutter="30">
-      <el-col :span="15">
+      <el-col :span="24">
         <el-form
           ref="formDataRef" :model="formData" :rules="rules" label-position="right" label-width="130px"
-          class="form-container" size="default" @submit.prevent
+          class="form-container" size="default" :disabled="dialogStatus === 'detail'" @submit.prevent
         >
           <el-row :gutter="10">
             <el-col :span="24" class="grid-cell">
-              <el-form-item label="关联边缘设备" prop="equipmentName" class="required">
+              <el-form-item label="关联边缘设备" prop="boxId" class="required">
                 <el-select
-                  v-model="formData.edgeDevice"
+                  v-model="formData.boxId"
                   placeholder="关联边缘设备"
                   clearable
                   filterable
+                  :disabled="dialogStatus === 'detail'"
                 >
-                  <el-option v-for="item of edgeDeviceList" :key="item.id" :label="item.equipmentName" :value="item.id" >
+                  <el-option v-for="item of edgeDeviceList" :key="item.id" :label="item.boxName" :value="item.id">
                     <div style="display: flex;justify-content: space-between;">
-                      <span style="font-weight: 600;">{{ item.equipmentName }}</span>
-                      <span style="color: #8492a6; font-size: 13px">{{ item.area }}</span>
-                      <span style="color: #8492a6; font-size: 13px">{{ item.deptName }}</span>
+                      <span style="font-weight: 600;">{{ item.boxName }}</span>
+                      <span style="color: #8492a6; font-size: 13px" :style="{ color: `${item.deviceStatus}` === '0' ? '#0e932e' : '#979797' }">{{ `${item.deviceStatus}` === '0' ? '在线' : '离线' }}</span>
+                      <span style="color: #8492a6; font-size: 13px">{{ item.ip }}</span>
                     </div>
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="14">
-              <el-form-item label="识别间隔(s)" prop="imageSaveInterval">
+              <el-form-item label="识别间隔(s)" prop="recognitionInterval">
                 <el-input-number
-                  v-model="formData.imageSaveInterval" class="full-width-input"
+                  v-model="formData.recognitionInterval" class="full-width-input"
                   :min="1" :precision="0" :step="1" placeholder="必填"
+                  :disabled="dialogStatus === 'detail'"
                 />
               </el-form-item>
             </el-col>
@@ -236,34 +305,53 @@
                 <el-input-number
                   v-model="formData.alarmInterval" class="full-width-input"
                   :min="1" :precision="0" :step="1" placeholder="必填"
+                  :disabled="dialogStatus === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="14">
+              <el-form-item label="rtsp地址" prop="rtspUrl">
+                <el-input
+                  v-model="formData.rtspUrl" class="full-width-input"
+                  placeholder="必填"
+                  :disabled="dialogStatus === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="14">
+              <el-form-item label="识别流地址 " prop="recognitionUrl">
+                <el-input
+                  v-model="formData.recognitionUrl" class="full-width-input"
+                  placeholder="必填"
+                  :disabled="dialogStatus === 'detail'"
                 />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="24">
-              <el-form-item label="场景模式" prop="mode">
-                <el-radio-group v-model="formData.mode">
-                  <el-radio label="2">
+              <el-form-item label="场景模式" prop="type">
+                <el-radio-group v-model="formData.type" :disabled="dialogStatus === 'detail'">
+                  <el-radio :label="1">
                     业务场景
                   </el-radio>
-                  <el-radio label="1">
+                  <el-radio :label="0">
                     算法关联
                   </el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="formData.mode === '2'" :gutter="24">
+          <el-row v-if="formData.type === 1" :gutter="24">
             <el-col :span="24">
-              <el-form-item label="业务场景" prop="relationSceneName">
+              <el-form-item label="业务场景" prop="sceneId">
                 <el-select
-                  v-model="formData.relationSceneName" placeholder="业务场景" clearable class="select"
-                  style="width: 100%;"
+                  v-model="formData.sceneId" placeholder="业务场景" clearable class="select"
+                  style="width: 100%;" :disabled="dialogStatus === 'detail'"
                 >
-                  <el-option v-for="item in sceneList" :key="item.id" :value="item.name" :label="item.name">
+                  <el-option v-for="item in sceneList" :key="item.id" :value="item.id" :label="item.sceneName">
                     <div style="display: flex;justify-content: space-between;">
-                      <span style="font-weight: 600;">{{ item.name }}</span>
+                      <span style="font-weight: 600;">{{ item.sceneName }}</span>
                       <span style="color: #8492a6; font-size: 13px">{{ item.version }}</span>
                     </div>
                   </el-option>
@@ -271,54 +359,74 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="formData.mode === '1'" :gutter="24">
+          <el-row v-if="formData.type === 0" :gutter="24">
             <el-col :span="24">
-              <el-form-item label="算法关联" prop="relationModelNames">
+              <el-form-item label="算法名称" prop="algoModelId">
+                <el-select
+                  v-model="formData.algoModelId" placeholder="请选择算法" clearable class="select"
+                  style="width: 100%;" :disabled="dialogStatus === 'detail'"
+                  @change="changeAlgoModelId"
+                >
+                  <el-option v-for="item in algorithmList" :key="item.id" :value="item.id" :label="item.modelName">
+                    <div style="display: flex;justify-content: space-between;">
+                      <span style="font-weight: 600;">{{ item.modelName }}</span>
+                      <span style="color: #8492a6; font-size: 13px">{{ item.version }}</span>
+                    </div>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="formData.type === 0" :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="报警对象">
                 <el-table
-                  ref="multipleTableRef" :data="algorithmList" border stripe style="width: 100%;"
+                  ref="algorithmTableRef" :data="recognitionList" border stripe style="width: 100%;"
                   max-height="400px" @selection-change="selectModel"
                 >
-                  <el-table-column label="算法名称" align="center" value="name">
-                    <template #default="scope">
-                      {{ scope.row.name }}
+                  <el-table-column
+                    v-for="item in columns"
+                    :key="item.value"
+                    :prop="item.value"
+                    :label="item.text"
+                    align="center"
+                  >
+                    <template #header>
+                      <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
                     </template>
-                  </el-table-column>
-                  <el-table-column label="置信度" align="center">
                     <template #default="scope">
                       <el-input-number
-                        v-model="scope.row.customThreshold"
-                        :min="1"
-                        :precision="0.01"
+                        v-if="dialogStatus !== 'detail' && (item.value === 'confidenceLevel' || item.value === 'threshold')"
+                        v-model="scope.row[item.value]"
+                        :min="0"
+                        :precision="2"
                         controls-position="right"
                       />
+                      <!-- <el-input-number v-if="item.value === 'threshold'" v-model="scope.row[item.value]" controls-position="right" :min="0" /> -->
+                      <span v-else>{{ scope.row[item.value] }}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column label="阈值" align="center">
-                    <template #default="scope">
-                      <el-input-number v-model="scope.row.customThreshold" controls-position="right" :min="0" />
-                    </template>
-                  </el-table-column>
-                  <el-table-column type="selection" width="55" align="center" />
+                  <el-table-column :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
                 </el-table>
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
       </el-col>
-      <el-col :span="8">
+      <!-- <el-col :span="8">
         <span style="display: block;font-weight: 600; margin-bottom: 6px;font-size: 14px;">区域绘制</span>
         <div id="draw-area" class="draw">
-          <draw-area />
-          <span style="margin-top: 10px;font-size: 11px;color: red;">注意：请绘制出一个四边形</span>
+          <draw-area :dialog-status="dialogStatus" @givePoints="givePoints"/>
+          <span v-if="dialogStatus !== 'detail'" style="margin-top: 10px;font-size: 11px;color: red;">注意：请绘制出一个四边形</span>
         </div>
-      </el-col>
+      </el-col> -->
     </el-row>
     <template #footer>
-      <div v-show="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button :loading="btnLoading" type="primary" @click="submitForm">
+      <div class="dialog-footer">
+        <el-button v-if="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
-        <el-button @click="dialogClose">
+        <el-button @click="closeRefresh">
           取消
         </el-button>
       </div>
diff --git a/src/views/alarm/policyConfig/monitorPoint/list.vue b/src/views/alarm/policyConfig/monitorPoint/list.vue
index 5c93a17..eb94812 100644
--- a/src/views/alarm/policyConfig/monitorPoint/list.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/list.vue
@@ -6,6 +6,7 @@
 import type { IList, IListQuery } from './monitorPoint-interface'
 import EditDialog from './editDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getMonitorPointList } from '@/api/alarm/policyConfig/monitorPoint'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
@@ -16,34 +17,33 @@
 const loading = ref(false)
 // 默认查询条件
 const listQuery: Ref<IListQuery> = ref({
-  equipmentName: '', // 设备名称
-  status: '', // 在线状态
+  deviceName: '', // 设备名称
+  deviceStatus: '', // 在线状态
   offset: 1,
   limit: 20,
 })
 // 表格表头
 const columns: Ref<TableColumn[]> = ref([
-  { text: '摄像头名称', value: 'equipmentName', align: 'center' },
-  { text: '摄像头编号', value: 'equipmentNo', align: 'center' },
+  { text: '摄像头名称', value: 'deviceName', align: 'center' },
+  { text: '摄像头编号', value: 'deviceNo', align: 'center' },
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '关联边缘设备', value: 'edgeDevice', align: 'center' },
-  { text: 'RTSP地址', value: 'rtsp', align: 'center' },
-  { text: '识别间隔(s)', value: 'imageSaveInterval', align: 'center' },
+  { text: '关联边缘设备', value: 'boxName', align: 'center' },
+  { text: 'RTSP地址', value: 'rtspUrl', align: 'center' },
+  { text: '识别间隔(s)', value: 'recognitionInterval', align: 'center' },
   { text: '告警间隔(s)', value: 'alarmInterval', align: 'center' },
-  { text: '业务场景', value: 'relationSceneName', align: 'center' },
-  { text: '报警对象', value: 'relationModelNames', align: 'center' },
-  // { text: '在线状态', value: 'status', align: 'center' },
+  { text: '业务场景', value: 'typeName', align: 'center' },
+  { text: '报警对象', value: 'recognitionTypeName', align: 'center' },
 ])
 const total = ref(0) // 数据条数
 const list = ref<IList[]>([]) // 数据条数
 const checkoutList = ref<IList[]>([]) // 数据条数
 
 // ------------------------------------字典------------------------------------------
-const statusList = ref<dictType[]>([]) // 在线状态
+const deviceStatusList = ref<dictType[]>([]) // 在线状态
 const getDict = () => {
   // 在线状态
   getDictByCode('status').then((response) => {
-    statusList.value = response.data
+    deviceStatusList.value = response.data
   })
 }
 getDict()
@@ -52,52 +52,26 @@
 // 查询数据
 const fetchData = () => {
   loading.value = true
-  // getDevListPage(listQuery).then((res: { data: { rows: []; total: number } }) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loading.value = false
-  // })
-  list.value = [{
-    id: '1',
-    equipmentName: '测试数据1', // 设备名称
-    equipmentNo: '测试数据1', // 设备编号
-    // area: '测试数据1', // 所属区域
-    deptName: '测试数据1', // 所属单位
-    edgeDevice: '测试数据1', // 关联边缘设备
-    rtsp: '测试数据1', // RTSP地址
-    imageSaveInterval: 20, // 识别间隔
-    alarmInterval: 20, // 告警间隔
-    relationSceneName: '测试数据1', // 业务场景
-    relationModelNames: '测试数据1', // 报警对象
-    mode: '1',
-    status: '在线', // 在线状态
-    deptId: '测试数据1', // 所属单位id
-  },
-  {
-    id: '2',
-    equipmentName: '测试数据2', // 设备名称
-    equipmentNo: '测试数据2', // 设备编号
-    // area: '测试数据2', // 所属区域
-    deptName: '测试数据2', // 所属单位
-    edgeDevice: '测试数据2', // 关联边缘设备
-    rtsp: '测试数据2', // RTSP地址
-    imageSaveInterval: 20, // 识别间隔
-    alarmInterval: 20, // 告警间隔
-    mode: '2',
-    relationSceneName: '测试数据2', // 业务场景
-    relationModelNames: '测试数据2', // 报警对象
-    status: '离线', // 在线状态
-    deptId: '测试数据2', // 所属单位id
-  },
-  ]
+  getMonitorPointList(listQuery.value).then((res: { data: { rows: []; total: number } }) => {
+    list.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        typeName: `${item.type}` === '1' ? item.sceneRelation.sceneName : '/', // 业务场景
+        recognitionTypeName: `${item.type}` === '0' ? item.deviceModelRelations.map((i: { recognitionTypeName: any }) => i.recognitionTypeName).join(',') : '/', // 报警对象
+      }
+    })
+    total.value = res.data.total
+    loading.value = false
+  })
+
   loading.value = false
 }
 
 // 搜索重置
 const reset = () => {
   listQuery.value = {
-    equipmentName: '', // 设备名称
-    status: '', // 在线状态
+    deviceName: '', // 设备名称
+    deviceStatus: '', // 在线状态
     offset: 1,
     limit: 20,
   }
@@ -120,7 +94,7 @@
 // 删除
 const del = (row: IList) => {
   ElMessageBox.confirm(
-    `确定要删除${row.equipmentName}吗？`,
+    `确定要删除${row.deviceName}吗？`,
     '确认删除',
     {
       confirmButtonText: '确定',
@@ -156,31 +130,38 @@
   <app-container>
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.equipmentName" placeholder="设备名称" clearable style="width: 200px;" @change="search" />
+        <el-input v-model="listQuery.deviceName" placeholder="摄像头名称" clearable style="width: 200px;" @change="search" />
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.status"
+          v-model="listQuery.deviceStatus"
           placeholder="在线状态"
           style="width: 220px;"
           clearable
           @change="search"
         >
-          <el-option v-for="item of statusList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-option v-for="item of deviceStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <normal-table :query="listQuery" :list-loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="在线状态" align="center" width="120">
             <template #default="scope">
-              <el-tag :type="scope.row.status === '在线' ? 'success' : 'danger'">
-                {{ scope.row.status }}
+              <el-tag v-if="scope.row.deviceStatusName" :type="scope.row.deviceStatusName === '在线' ? 'success' : 'danger'">
+                {{ scope.row.deviceStatusName }}
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="120" align="center">
+          <el-table-column label="操作" width="120" align="center" fixed="right">
             <template #default="scope">
               <el-button type="primary" link size="small" class="table-text-button" @click="detail(scope.row)">
                 详情

diff --git a/public/config/config.json b/public/config/config.json
index a85fc42..29161c3 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -10,5 +10,5 @@
   "maxZoom": "13",
   "zoom": "10",
   "timeGap": 3000,
-  "systemType": "sm"
+  "systemType": "gm"
 }
diff --git a/src/api/alarm/dangerAssessment/manage.ts b/src/api/alarm/dangerAssessment/manage.ts
new file mode 100644
index 0000000..dae1056
--- /dev/null
+++ b/src/api/alarm/dangerAssessment/manage.ts
@@ -0,0 +1,50 @@
+/**
+ * 安全生产隐患管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getDangerAssessmentManageList(data: any) {
+  return request({
+    url: 'risk/listPage',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 详情
+export function getDangerAssessmentManageDetail(data: { id: string }) {
+  return request({
+    url: 'risk/detail',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 新增
+export function addDangerAssessmentManage(data: object) {
+  return request({
+    url: 'risk/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateDangerAssessmentManage(data: object) {
+  return request({
+    url: 'risk/update',
+    method: 'post',
+    data,
+  })
+}
+
+// 批量导入
+export function batchImport(data: object) {
+  return request({
+    url: 'risk/batchImport',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/alarm/policyConfig/monitorPoint.ts b/src/api/alarm/policyConfig/monitorPoint.ts
new file mode 100644
index 0000000..e4cd648
--- /dev/null
+++ b/src/api/alarm/policyConfig/monitorPoint.ts
@@ -0,0 +1,68 @@
+/**
+ * 监控点位管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getMonitorPointList(data: any) {
+  return request({
+    url: 'device/relation/listPage',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 详情
+export function getMonitorPointDetail(data: { id: string }) {
+  return request({
+    url: 'device/relation/detail',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 编辑
+export function updateMonitorPoint(data: object) {
+  return request({
+    url: 'device/relation/update',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取盒子列表
+export function getBoxList(data: any) {
+  return request({
+    url: 'device/box/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 获取算法列表
+export function getModelList(data: any) {
+  return request({
+    url: 'device/model/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 获取算法-场景对象列表
+export function getSceneList(data: any) {
+  return request({
+    url: 'scene/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 算法报警对象
+export function getRecognitionList(data: any) {
+  return request({
+    url: 'device/recognitionType/recognitionList',
+    method: 'get',
+    params: data,
+  })
+}
+
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 04b39cc..92165e1 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -40,7 +40,7 @@
     default: 'default',
   }, // 输入框大小
 })
-const emit = defineEmits(['update:modelValue'])
+const emit = defineEmits(['update:modelValue', 'changeDept'])
 // ------------定义props参数----------
 const value = computed({
   get() {
@@ -153,6 +153,10 @@
     return []
   }
 }
+
+const changeDept = (val: any) => {
+  emit('changeDept', val)
+}
 // --------暴露方法
 defineExpose({ refreshTree, fetchDeptTree, findChildren })
 </script>
@@ -176,6 +180,7 @@
       filterable
       class="full-width-input"
       :disabled="props.disabled"
+      @change="changeDept"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index d1f5b24..e3d6460 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -8,5 +8,6 @@
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
   fixed?: boolean // 固定列
+  required?: boolean // 是否必填
 }
 
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
index 31a16b9..fb5f8ac 100644
--- a/src/utils/useCheckList.ts
+++ b/src/utils/useCheckList.ts
@@ -1,5 +1,4 @@
 import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 
 /**
  * 检查列表
@@ -7,13 +6,14 @@
  * @param columns // 表头信息
  * @param tableTitle // 表格名称
  */
-export function useCheckList(list: { [key: string]: string }[], columns: TableColumn, tableTitle = '') {
+export function useCheckList(list: { [key: string]: string }[], columns: any, tableTitle = '') {
   for (let index = 0; index < list.length; index++) {
     const item = list[index]
     for (const prop of columns) {
       // 检查必填
       if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        // ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        ElMessage.warning(`请先完善${tableTitle}中【${item.typeName}】的${prop.text}`)
         return false
       }
       // 验证正则
diff --git a/src/views/alarm/dangerAssessment/manage/editPointDialog.vue b/src/views/alarm/dangerAssessment/manage/editPointDialog.vue
new file mode 100644
index 0000000..db4b29f
--- /dev/null
+++ b/src/views/alarm/dangerAssessment/manage/editPointDialog.vue
@@ -0,0 +1,219 @@
+<!-- 新增、编辑危险点 -->
+<script lang="ts" setup name="EditPointDialog">
+import { reactive, ref } from 'vue'
+import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { addDangerAssessmentManage, updateDangerAssessmentManage } from '@/api/alarm/dangerAssessment/manage'
+const emits = defineEmits(['closeRefresh'])
+const dialogStatus = ref('add')
+const dialogVisible = ref(false) // 弹窗显示隐藏
+// 显示标题
+const textMap: { [key: string]: string } = {
+  detail: '详情',
+  edit: '编辑',
+  add: '新增',
+}
+
+// 表单数据对象
+const formData = ref({
+  id: '',
+  deptId: '', // 所属单位id
+  deptName: '', // 所属单位
+  riskName: '', // 危险点名称
+  address: '', // 详细地址
+  content: '', // 作业活动概述
+  nature: '', // 危险性质
+  grade: '', // 等级
+  assignPost: '', // 定岗
+  staffQuota: 1, // 定员
+  substancesQuantities: '', // 危险物质及定量
+})
+const btnLoading = ref(false) // 保存按钮加载状态
+const formDataRef = ref<FormInstance>() // 表单对象
+// 校验规则
+const rules = reactive<FormRules>({
+  deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
+  riskName: [{ required: true, message: '危险点名称必填', trigger: ['blur', 'change'] }],
+  address: [{ required: true, message: '详细地址必填', trigger: ['blur', 'change'] }],
+  content: [{ required: true, message: '作业活动概述必填', trigger: ['blur', 'change'] }],
+  nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
+  grade: [{ required: true, message: '等级必填', trigger: ['blur', 'change'] }],
+  assignPost: [{ required: true, message: '定岗必填', trigger: ['blur', 'change'] }],
+  staffQuota: [{ required: true, message: '定员必填', trigger: ['blur', 'change'] }],
+  substancesQuantities: [{ required: true, message: '危险物质及定量必填', trigger: ['blur', 'change'] }],
+})
+
+// -----------------------------------------字典--------------------------------------------------------------
+const deviceStatusList = ref<dictType[]>([]) // 危险点等级
+const getDict = async () => {
+  // 危险点等级
+  getDictByCode('dangerPointGrade').then((response) => {
+    deviceStatusList.value = response.data
+  })
+}
+getDict()
+// -------------------------------------------------------------------------------------------
+// 表单提交
+function submitForm() {
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.warning('新增危险点成功')
+            return false
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.warning('编辑危险点成功')
+            return false
+          })
+        }
+      }
+    })
+  }
+}
+
+// 重置表单
+function resetForm() {
+  formData.value = {
+    id: '',
+    deptId: '', // 所属单位id
+    deptName: '', // 所属单位
+    riskName: '', // 危险点名称
+    address: '', // 详细地址
+    content: '', // 作业活动概述
+    nature: '', // 危险性质
+    grade: '', // 等级
+    assignPost: '', // 定岗
+    staffQuota: 1, // 定员
+    substancesQuantities: '', // 危险物质及定量
+  }
+}
+
+// -----------------------------------初始化、关闭对话框相关-----------------------------------------
+function initDialog(dialogstatus: string, row: any) {
+  dialogVisible.value = true
+  if (dialogstatus === 'edit' || dialogstatus === 'detail') {
+    formData.value.id = row.id
+    formData.value.deptId = row.deptId // 所属单位id
+    formData.value.deptName = row.deptName // 所属单位
+    formData.value.riskName = row.riskName // 危险点名称
+    formData.value.address = row.address // 详细地址
+    formData.value.content = row.content // 作业活动概述
+    formData.value.nature = row.nature // 危险性质
+    formData.value.grade = row.grade // 等级
+    formData.value.assignPost = row.assignPost // 定岗
+    formData.value.staffQuota = Number(row.staffQuota) // 定员
+    formData.value.substancesQuantities = row.substancesQuantities // 危险物质及定量
+  }
+
+  // 详情隐藏表单校验
+  if (dialogstatus === 'detail') {
+    formDataRef.value?.clearValidate()
+  }
+  dialogStatus.value = dialogstatus // 类型 新建add 编辑edit 详情detail
+  btnLoading.value = false
+}
+
+// 关闭并刷新
+function closeRefresh() {
+  dialogVisible.value = false
+  resetForm()
+  emits('closeRefresh')
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible" :title="textMap[dialogStatus]" width="800" :before-close="closeRefresh" append-to-body
+    :open-delay="0" :close-on-click-modal="false"
+  >
+    <el-form
+      ref="formDataRef" :model="formData" :rules="rules" label-position="right" label-width="130px"
+      class="form-container" size="default" :disabled="dialogStatus === 'detail'" @submit.prevent
+    >
+      <el-row :gutter="10">
+        <el-col :span="12">
+          <el-form-item label="所属单位" prop="deptId">
+            <dept-select v-model="formData.deptId" placeholder="必选" :disabled="dialogStatus === 'detail'" :dept-show="true" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="危险源名称" prop="riskName">
+            <el-input :value="formData.riskName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="详细地址" prop="address">
+            <el-input :value="formData.address" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="作业活动概述" prop="content">
+            <el-input :value="formData.content" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="危险性质" prop="nature">
+            <el-input :value="formData.nature" :disabled="dialogStatus === 'detail'" type="text" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="等级" prop="grade">
+            <el-select
+              v-model="formData.grade"
+              placeholder="必选"
+              clearable
+              filterable
+              :disabled="dialogStatus === 'detail'"
+            >
+              <el-option v-for="item of deviceStatusList" :key="item.id" :label="item.name" :value="item.name "/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="定岗" prop="assignPost">
+            <el-input :value="formData.assignPost" :disabled="dialogStatus === 'detail'" type="text" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="定员" prop="staffQuota">
+            <el-input-number
+              v-model="formData.staffQuota" class="full-width-input"
+              :min="1" :precision="0" :step="1" placeholder="必填"
+              :disabled="dialogStatus === 'detail'"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="危险物质及定量" prop="substancesQuantities">
+            <el-input :value="formData.substancesQuantities" :disabled="dialogStatus === 'detail'" type="text" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button v-if="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button @click="closeRefresh">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//
+</style>
diff --git a/src/views/alarm/dangerAssessment/manage/list.vue b/src/views/alarm/dangerAssessment/manage/list.vue
index a1b6214..3e27450 100644
--- a/src/views/alarm/dangerAssessment/manage/list.vue
+++ b/src/views/alarm/dangerAssessment/manage/list.vue
@@ -5,61 +5,112 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IList, IListQuery } from './manage-interface'
 // import EditDialog from './editDialog.vue'
+import editPointDialog from './editPointDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { uploadApi } from '@/api/monitor/dev'
 import { getDictByCode } from '@/api/system/dict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { dictType } from '@/global'
+import { getDangerAssessmentManageList } from '@/api/alarm/dangerAssessment/manage'
 const { proxy } = getCurrentInstance() as any
 const editDialogRef = ref() // 组件
 const router = useRouter()
 // 文件上传input
 const fileRef = ref()
 const loading = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// ------------------------------------------------------------------------------------------
 // 默认查询条件
 const listQuery: Ref<IListQuery> = ref({
   area: '', // 所属区域
-  deptId: '', // 所属区域
-  dangerCategory: '', // 隐患分类
-  startTime: '', // 开始时间
-  endTime: '', // 结束时间
+  deptId: '', // 所属组织
+  riskName: '', // 危险点名称
+  riskType: '', // 危险点类型
   offset: 1,
   limit: 20,
 })
-// 表格表头
-const columns: Ref<TableColumn[]> = ref([
-  { text: '所属区域', value: 'area', align: 'center' },
+// ------------------------------------------表头---------------------------------------------
+const columns: Ref<TableColumn[]> = ref([]) // 表头
+// 危险点
+const columnsPoint: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '业务内容', value: 'businessContent', align: 'center' },
-  { text: '隐患分类Ⅰ', value: 'yhfl1', align: 'center' },
-  { text: '隐患分类Ⅱ', value: 'yhfl2', align: 'center' },
-  { text: '监控相机', value: 'equipmentName', align: 'center' },
-  { text: '录入时间', value: 'time', align: 'center' },
-  { text: '备注', value: 'remark', align: 'center' },
-])
+  { text: '危险点名称', value: 'riskName', align: 'center' },
+  { text: '详细地址', value: 'address', align: 'center' },
+  { text: '作业活动概述', value: 'content', align: 'center' },
+  { text: '危险性质', value: 'nature', align: 'center' },
+  { text: '等级', value: 'grade', align: 'center' },
+  { text: '定岗', value: 'assignPost', align: 'center' },
+  { text: '定员', value: 'staffQuota', align: 'center' },
+  { text: '危险物质及定量', value: 'substancesQuantities', align: 'center' },
+]
+// 重大危险源
+const columnsSource: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险源名称', value: 'businessContent', align: 'center' },
+  { text: '场所级别', value: 'yhfl1', align: 'center' },
+  { text: '危险化学品名称', value: 'yhfl2', align: 'center' },
+  { text: '危险性质', value: 'equipmentName', align: 'center' },
+  { text: '存量', value: 'time', align: 'center' },
+  { text: '临界量', value: 'remark', align: 'center' },
+  { text: '分级指数', value: 'remark', align: 'center' },
+  { text: '危险物质及定量', value: 'remark', align: 'center' },
+  { text: '危险源等级', value: 'remark', align: 'center' },
+]
+// 危险化学品场所
+const columnsChemistry: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险化学品场所', value: 'businessContent', align: 'center' },
+  { text: '场所分类', value: 'yhfl1', align: 'center' },
+  { text: '作业活动', value: 'yhfl2', align: 'center' },
+  { text: '危化品名称', value: 'equipmentName', align: 'center' },
+  { text: '危险性质', value: 'time', align: 'center' },
+  { text: '定岗', value: 'remark', align: 'center' },
+  { text: '定员', value: 'remark', align: 'center' },
+  { text: '定量', value: 'remark', align: 'center' },
+  { text: '定寿命', value: 'remark', align: 'center' },
+  { text: '定检', value: 'remark', align: 'center' },
+]
+// 危险作业
+const columnsWork: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险作业', value: 'businessContent', align: 'center' },
+  { text: '危险作业等级', value: 'yhfl1', align: 'center' },
+  { text: '主要危险描述', value: 'yhfl2', align: 'center' },
+  { text: '相关部门', value: 'equipmentName', align: 'center' },
+  { text: '作业频次', value: 'time', align: 'center' },
+]
+// 危险作业工序
+const columnsWorkProcesses: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险作业工序', value: 'businessContent', align: 'center' },
+  { text: '作业人员数量', value: 'yhfl1', align: 'center' },
+  { text: '事故类型', value: 'yhfl2', align: 'center' },
+]
+// -------------------------------------------------------------------------------------------
 const total = ref(0) // 数据条数
-const list = ref<IList[]>([]) // 数据条数
-const checkoutList = ref<IList[]>([]) // 数据条数
-// 开始结束时间
-const datetimerange = ref()
-watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
-  if (Array.isArray(newVal)) {
-    if (newVal.length) {
-      listQuery.value.startTime = `${newVal[0]} 00:00:00`
-      listQuery.value.endTime = `${newVal[1]} 23:59:59`
+const list = ref([]) // 数据条数
+const checkoutList = ref([]) // 数据条数
+
+const editPointDialogRef = ref() // 危险点ref
+// -----------------------------------------字典--------------------------------------------------------------
+// 查询字典
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('dangerAssessmentType')
+  // 制作右上角的菜单
+  const tempMenu = ['重大危险源', '危险点', '危险化学品场所', '危险作业', '危险作业工序']
+  tempMenu.forEach((item) => {
+    const tempFindData = res.data.find((e: { name: string; value: string }) => e.name === item)
+    if (tempFindData) {
+      menu.value.push({
+        name: tempFindData.name,
+        id: `${tempFindData.value}`,
+      })
     }
-  }
-})
-// ------------------------------------字典------------------------------------------
-// const statusList = ref<dictType[]>([]) // 在线状态
-const getDict = () => {
-  // // 在线状态
-  // getDictByCode('status').then((response) => {
-  //   statusList.value = response.data
-  // })
+  })
 }
-getDict()
 // -----------------------------------文件上传-------------------------------------------
 // 点击批量导入
 const batchImport = () => {
@@ -101,34 +152,12 @@
 // 查询数据
 const fetchData = () => {
   loading.value = true
-  // getDevListPage(listQuery).then((res: { data: { rows: []; total: number } }) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loading.value = false
-  // })
-  list.value = [{
-    id: '1',
-    area: '测试数据1', // 设备名称
-    deptName: '测试数据1', // 设备编号
-    businessContent: '测试数据1', // 所属单位
-    yhfl1: '测试数据1', // RTSP地址
-    yhfl2: '测试数据1', // 识别间隔
-    equipmentName: '测试数据1', // 告警间隔
-    time: '2021-11-11',
-    remark: '测试数据1', // 业务场景
-  },
-  {
-    id: '2',
-    area: '测试数据2', // 设备名称
-    deptName: '测试数据2', // 设备编号
-    businessContent: '测试数据2', // 所属单位
-    yhfl1: '测试数据2', // RTSP地址
-    yhfl2: '测试数据2', // 识别间隔
-    equipmentName: '测试数据2', // 告警间隔
-    time: '2022-09-08',
-    remark: '测试数据2', // 业务场景
-  },
-  ]
+  listQuery.value.riskType = active.value // 危险点类型
+  getDangerAssessmentManageList(listQuery.value).then((res: { data: { rows: []; total: number } }) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    loading.value = false
+  })
   loading.value = false
 }
 
@@ -136,14 +165,12 @@
 const reset = () => {
   listQuery.value = {
     area: '', // 所属区域
-    deptId: '', // 所属区域
-    dangerCategory: '', // 隐患分类
-    startTime: '', // 开始时间
-    endTime: '', // 结束时间
+    deptId: '', // 所属组织
+    riskName: '', // 危险点名称
+    riskType: '', // 危险点类型
     offset: 1,
     limit: 20,
   }
-  datetimerange.value = []
   fetchData()
 }
 
@@ -154,17 +181,57 @@
 
 // 新增
 const add = (row: IList) => {
-  ElMessage.info('敬请期待')
+  switch (active.value) {
+    case '1': // 危险点
+      editPointDialogRef.value.initDialog('add')
+      break
+    case '2': // 重大危险源
+      break
+    case '3': // 危险化学品场所
+      break
+    case '4': // 危险作业
+      break
+    case '5': // 危险作业工序
+      break
+  }
   // editDialogRef.value.initDialog('add')
 }
 // 详情
 const detail = (row: IList) => {
-  editDialogRef.value.initDialog('detail', row)
+  switch (active.value) {
+    case '1': // 危险点
+      editPointDialogRef.value.initDialog('detail', row)
+      break
+    case '2': // 重大危险源
+      break
+    case '3': // 危险化学品场所
+      break
+    case '4': // 危险作业
+      break
+    case '5': // 危险作业工序
+      break
+  }
+}
+// 编辑
+const edit = (row: IList) => {
+  switch (active.value) {
+    case '1': // 危险点
+      editPointDialogRef.value.initDialog('edit', row)
+      break
+    case '2': // 重大危险源
+      break
+    case '3': // 危险化学品场所
+      break
+    case '4': // 危险作业
+      break
+    case '5': // 危险作业工序
+      break
+  }
 }
 // 删除
 const del = (row: IList) => {
   ElMessageBox.confirm(
-    `确定要删除${row.equipmentName}吗？`,
+    '确定删除吗？',
     '确认删除',
     {
       confirmButtonText: '确定',
@@ -191,7 +258,39 @@
   fetchData()
 }
 
-onMounted(() => {
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  reset()
+}
+
+watch(() => active.value, (newValue) => {
+  console.log(newValue)
+  switch (newValue) {
+    case '1': // 危险点
+      columns.value = columnsPoint
+      break
+    case '2': // 重大危险源
+      columns.value = columnsSource
+      break
+    case '3': // 危险化学品场所
+      columns.value = columnsChemistry
+      break
+    case '4': // 危险作业
+      columns.value = columnsWork
+      break
+    case '5': // 危险作业工序
+      columns.value = columnsWorkProcesses
+      break
+    default:
+      columns.value = columnsPoint
+      break
+  }
+}, { immediate: true })
+
+onMounted(async () => {
+  await getDict()
+  active.value = '1'
   fetchData()
 })
 </script>
@@ -200,19 +299,10 @@
   <app-container>
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.area" placeholder="所属区域" clearable style="width: 200px;" @change="search" />
+        <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search" @changeDept="search"/>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search" />
-      </search-item>
-      <search-item>
-        <el-input v-model="listQuery.dangerCategory" placeholder="隐患分类" clearable style="width: 200px;" @change="search" />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
-          range-separator="至" start-placeholder="录入时间(开始)" end-placeholder="录入时间(结束)" @change="search"
-        />
+        <el-input v-model="listQuery.riskName" placeholder="危险点名称" clearable style="width: 200px;" />
       </search-item>
     </search-area>
     <table-container>
@@ -222,12 +312,22 @@
       </template>
       <input v-show="false" ref="fileRef" type="file" accept="xlsx/*" @change="onFileChange">
       <normal-table :query="listQuery" :list-loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" width="120" align="center">
+          <el-table-column label="操作" width="150" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" class="table-text-button" @click="detail(scope.row)">
                 详情
               </el-button>
+              <el-button type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
+                编辑
+              </el-button>
               <el-button type="danger" link size="small" class="table-text-button" @click="del(scope.row)">
                 删除
               </el-button>
@@ -237,5 +337,9 @@
       </normal-table>
     </table-container>
     <edit-dialog ref="editDialogRef" @close-refresh="search" />
+    <!-- 编辑危险点 -->
+    <edit-point-dialog ref="editPointDialogRef" />
+    <!-- 右上角按钮集合 -->
+    <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
   </app-container>
 </template>
diff --git a/src/views/alarm/dangerAssessment/manage/manage-interface.ts b/src/views/alarm/dangerAssessment/manage/manage-interface.ts
index e19c1be..3740441 100644
--- a/src/views/alarm/dangerAssessment/manage/manage-interface.ts
+++ b/src/views/alarm/dangerAssessment/manage/manage-interface.ts
@@ -1,9 +1,8 @@
 export interface IListQuery {
   area: string // 所属区域
-  deptId: string // 所属区域
-  dangerCategory: string // 隐患分类
-  startTime: string // 开始时间
-  endTime: string // 结束时间
+  deptId: string // 所属组织
+  riskName: string // 危险点名称
+  riskType: string // 危险点类型
   offset: number
   limit: number
 }
diff --git a/src/views/alarm/policyConfig/monitorPoint/drawArea.vue b/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
index e902322..6e72273 100644
--- a/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
@@ -1,4 +1,10 @@
 <script lang="ts" setup name="DrawArea">
+const props = defineProps({
+  dialogStatus: {
+    type: String,
+  },
+})
+const emits = defineEmits(['givePoints'])
 const points = ref([ // 标记点初始
   { x: 50, y: 50 }, // 左上
   { x: 150, y: 50 },
@@ -25,6 +31,9 @@
   }
 
   function drag(e: any, pointIndex: number) {
+    if (props.dialogStatus === 'detail') {
+      return
+    }
     e = e || window.event
     e.preventDefault()
     var mousePos = { x: e.clientX - canvas.getBoundingClientRect().left, y: e.clientY - canvas.getBoundingClientRect().top }
@@ -48,6 +57,9 @@
   }
 
   function addDragEvents() {
+    if (props.dialogStatus === 'detail') {
+      return
+    }
     var dragEvents = {
       dragStart(e: any) {
         e = e || window.event
@@ -98,6 +110,7 @@
 ])
 
 watch(() => points.value, () => {
+  emits('givePoints', points.value)
   style.value = [
     {
       top: `${points.value[0].y - 5}px`,
@@ -124,7 +137,7 @@
 <template>
   <div style="width: 400px;height: 300px;">
     <canvas id="myCanvas" width="400" height="300" class="canvans" />
-    <div v-for="(item, index) in points" :key="index" class="point" :style="style[index]" />
+    <div v-for="(item, index) in points" :key="index" :class="props.dialogStatus === 'detail' ? 'detail-point' : 'point'" :style="style[index]" />
   </div>
 </template>
 
@@ -158,4 +171,19 @@
     cursor: move;
   }
 }
+.detail-point {
+  width: 10px;
+  height: 10px;
+  position: absolute;
+  border-radius: 50%;
+  background-color: red;
+  opacity: 0.5;
+  top: 0;
+  left: 0;
+  z-index: 99;
+
+  &:hover {
+    cursor: not-allowed
+  }
+}
 </style>
diff --git a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
index 5a6a046..36618a7 100644
--- a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
@@ -4,13 +4,12 @@
 import { nextTick, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import type { IList as IEdgeDeviceList } from '../edgeDevice/edgeDevice-interface'
-import type { IList as ISceneList } from '../../library/scene/scene-interface'
-import type { IList as IAlgorithmList } from '../../library/algorithm/algorithm-interface'
 import type { IForm, IList } from './monitorPoint-interface'
 import drawArea from './drawArea.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { isIp } from '@/utils/validate'
-import { getDictByCode } from '@/api/system/dict'
+import { useCheckList } from '@/utils/useCheckList'
+import { getBoxList, getModelList, getRecognitionList, getSceneList, updateMonitorPoint } from '@/api/alarm/policyConfig/monitorPoint'
 const emits = defineEmits(['closeRefresh'])
 const dialogStatus = ref('add')
 const dialogVisible = ref(false) // 弹窗显示隐藏
@@ -24,121 +23,127 @@
 // 表单数据对象
 const formData: Ref<IForm> = ref({
   id: '',
-  edgeDevice: '', // 关联边缘设备
-  imageSaveInterval: 60, // 识别间隔
+  boxId: '', // 关联边缘设备id
+  deviceId: '', // 设备id
+  recognitionInterval: 60, // 识别间隔
   alarmInterval: 60, // 告警间隔
-  mode: '', // 场景模式
-  relationSceneName: '', // 业务场景
-  relationModelNames: '', // 报警对象/算法关联
-})
+  type: 1, // 场景模式
 
+  sceneId: '', // 业务场景id
+  algoModelId: '', // 模型id
+
+  recognitionUrl: '', // 识别流地址
+  rtspUrl: '', // rtsp地址
+  boundary: '', // 识别边界
+})
+const selectModelList = ref<any[]>([]) // 选择的算法
+const algorithmTableRef = ref()
 const btnLoading = ref(false) // 保存按钮加载状态
 const formDataRef = ref<FormInstance>() // 表单对象
-
-const isIpV = (rule: any, value: any, callback: any) => {
-  if (value === '') {
-    callback(new Error('ip地址必填!'))
-  }
-  else if (isIp(value)) {
-    callback()
-  }
-  else {
-    callback(new Error('IP不合法'))
-  }
-  callback()
-}
 // 校验规则
 const rules = reactive<FormRules>({
-  equipmentName: [{ required: true, message: '关联边缘设备必选', trigger: ['blur', 'change'] }],
-  imageSaveInterval: [{ required: true, message: '识别间隔必填', trigger: ['blur', 'change'] }],
+  boxId: [{ required: true, message: '关联边缘设备必选', trigger: ['blur', 'change'] }],
+  recognitionInterval: [{ required: true, message: '识别间隔必填', trigger: ['blur', 'change'] }],
   alarmInterval: [{ required: true, message: '告警间隔必填', trigger: ['blur', 'change'] }],
-  mode: [{ required: true, message: '场景模式必选', trigger: ['blur', 'change'] }],
-  relationSceneName: [{ required: true, message: '业务场景必选', trigger: ['blur', 'change'] }],
-  relationModelNames: [{ required: true, message: '报警对象必选', trigger: ['blur', 'change'] }],
+  type: [{ required: true, message: '场景模式必选', trigger: ['blur', 'change'] }],
+  sceneId: [{ required: true, message: '业务场景必选', trigger: ['blur', 'change'] }],
+  algoModelId: [{ required: true, message: '算法名称必选', trigger: ['blur', 'change'] }],
+  recognitionUrl: [{ required: true, message: '识别流地址必填', trigger: ['blur', 'change'] }],
+  rtspUrl: [{ required: true, message: 'rtsp地址必填', trigger: ['blur', 'change'] }],
 })
 
+// 算法表格表头
+const columns = ref<TableColumn[]>([
+  { text: '名称', value: 'recognitionTypeName', align: 'center', required: false },
+  { text: '置信度', value: 'confidenceLevel', align: 'center', required: true },
+  { text: '阈值', value: 'threshold', align: 'center', required: true },
+])
+
 // -------------------------------------------------------------------------------------------
-const edgeDeviceList = ref<IEdgeDeviceList[]>([]) // 边缘设备列表
-const sceneList = ref<ISceneList[]>([]) // 业务场景列表
-const algorithmList = ref<IAlgorithmList[]>([]) // 算法列表
+const edgeDeviceList: any = ref([]) // 边缘设备列表
+const sceneList: any = ref([]) // 业务场景列表
+const algorithmList: any = ref([]) // 算法列表
+const recognitionList: any = ref([]) // 报警对象列表
 // 获取边缘设备
 const fetchEdgeDeviceList = () => {
   const params = {
-    equipmentName: '', // 设备名称
-    status: '', // 在线状态
-    offset: 1,
-    limit: 999999,
+    boxName: '', // 设备名称
+    code: '', // 在线状态
+    deviceStatus: '', // 在线状态
   }
-  edgeDeviceList.value = [{
-    id: '1',
-    equipmentName: '测试数据1', // 设备名称
-    equipmentNo: '测试数据1', // 设备编号
-    area: '测试数据1', // 所属区域
-    deptName: '203', // 所属单位
-    ip: '1.0.0.0', // ip地址
-    status: '在线', // 在线状态
-  },
-  {
-    id: '2',
-    equipmentName: '测试数据2', // 设备名称
-    equipmentNo: '测试数据2', // 设备编号
-    area: '测试数据2', // 所属区域
-    deptName: '706', // 所属单位
-    ip: '1.0.0.1', // ip地址
-    status: '离线', // 在线状态
-  },
-  ]
+  getBoxList(params).then((res: any) => {
+    edgeDeviceList.value = res.data
+  })
+  console.log('获取边缘设备', edgeDeviceList.value)
 }
 
 // 获取业务场景列表
 const fetchSceneList = () => {
-  sceneList.value = [{
-    id: '1',
-    cjId: '测试数据场景id1',
-    name: '测试数据场景名称1',
-    version: 'V1.0',
-    desc: '测试数据场景描述',
-    status: '未使用',
-  },
-  {
-    id: '2',
-    cjId: '测试数据场景id2',
-    name: '测试数据场景名称2',
-    version: 'V2.0',
-    desc: '测试数据场景描述测试数据场景描述测试数据场景描述测试数据场景描述测试数据场景描述测试数据场景描述测试数据场景描述测试数据场景描述',
-    status: '使用中',
-  },
-  ]
+  const params = {
+    handleTask: '', // 任务标识
+    sceneCode: '', // 场景编码
+    sceneName: '', // 名称
+  }
+  getSceneList(params).then((res: any) => {
+    sceneList.value = res.data
+  })
 }
 
 // 获取算法列表
 const fetchAlgorithmList = () => {
-  algorithmList.value = [{
-    id: '1',
-    sfId: '测试数据算法id1',
-    name: '测试数据算法名称1',
-    version: 'V1.0',
-    desc: '测试数据算法描述',
-    status: '未使用',
-  },
-  {
-    id: '2',
-    sfId: '测试数据算法id2',
-    name: '测试数据算法名称2',
-    version: 'V2.0',
-    desc: '测试数据算法描述',
-    status: '使用中',
-  },
-  ]
+  const params = {
+    code: '', // 模型ID
+    modelName: '', // 名称
+  }
+  getModelList(params).then((res: any) => {
+    algorithmList.value = res.data
+  })
 }
 
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
+  if (`${formData.value.type}` === '0') { // 算法关联
+    if (!selectModelList.value.length) {
+      ElMessage.warning('请选择报警对象')
+      return false
+    }
+    if (!useCheckList(selectModelList.value, columns.value, '报警对象')) {
+      return false
+    }
+  }
   if (formDataRef.value) {
     formDataRef.value?.validate((valid: boolean) => {
       if (valid) {
-        ElMessage.info('敬请期待')
+        selectModelList.value.forEach((item: any) => {
+          const index = recognitionList.value.findIndex((i: { id: string }) => i.id === item.id)
+          if (index !== -1) {
+            recognitionList.value.splice(index, 1, { ...item, isUse: '1' })
+          }
+          else {
+            recognitionList.value.splice(index, 1, { ...item, isUse: '0' })
+          }
+        })
+        const params = {
+          ...formData.value,
+          sceneRelation: formData.value.type === 1 ? { id: formData.value.id, sceneId: formData.value.sceneId } : null,
+          // eslint-disable-next-line multiline-ternary
+          deviceModelRelations: formData.value.type === 0 ? recognitionList.value.map((item: any) => {
+            return {
+              ...item,
+              algoModelId: formData.value.algoModelId, // 算法模型id
+              confidenceLevel:	item.confidenceLevel, // 置信度
+              isUse: item.isUse,
+              recognitionTypeId:	item.recognitionTypeId, // 模型识别类型
+              threshold: item.threshold,	 // 阈值
+            }
+          }) : [],
+        }
+        console.log('要传的参数', params)
+        updateMonitorPoint(params).then(() => {
+          ElMessage.success('设置成功')
+          closeRefresh()
+        })
       }
     })
   }
@@ -148,26 +153,74 @@
 function resetForm() {
   formData.value = {
     id: '',
-    edgeDevice: '', // 关联边缘设备
-    imageSaveInterval: 60, // 识别间隔
+    boxId: '', // 关联边缘设备id
+    deviceId: '', // 设备id
+    recognitionInterval: 60, // 识别间隔
     alarmInterval: 60, // 告警间隔
-    mode: '', // 场景模式
-    relationSceneName: '', // 业务场景
-    relationModelNames: '', // 报警对象/算法关联
+    type: 1, // 场景模式
+
+    sceneId: '', // 业务场景id
+    algoModelId: '', // 模型id
+
+    recognitionUrl: '', // 识别流地址
+    rtspUrl: '', // rtsp地址
+    boundary: '', // 识别边界
   }
+  edgeDeviceList.value = [] // 边缘设备列表
+  sceneList.value = [] // 业务场景列表
+  algorithmList.value = [] // 算法列表
+  recognitionList.value = [] // 报警对象列表
 }
 
-// 选择的算法
-const selectModelList = ref<any[]>([])
 const selectModel = (value: any) => {
   selectModelList.value = value
-  formData.value.relationModelNames = value.map((item: any) => item.name).join(',')
 }
 
 // -----------------------------------初始化、关闭对话框相关-----------------------------------------
-function initDialog(dialogstatus: string, row: IList) {
-  dialogStatus.value = dialogstatus // 类型 新建add 编辑edit 详情detail
+function initDialog(dialogstatus: string, row: any) {
   dialogVisible.value = true
+  fetchEdgeDeviceList() // 获取边缘设备列表
+  fetchAlgorithmList() // 获取算法列表
+  fetchSceneList() // 业务场景列表
+  if (dialogstatus === 'edit' || dialogstatus === 'detail') {
+    formData.value.boxId = row.boxId // 边缘设备id
+    formData.value.recognitionInterval = row.recognitionInterval || 60 // 识别间隔
+    formData.value.alarmInterval = row.alarmInterval || 60 // 告警间隔
+    formData.value.type = row.type // 场景模式
+    formData.value.id = row.id // id
+    formData.value.deviceId = row.deviceId // 设备id
+    formData.value.recognitionUrl = row.recognitionUrl || 'http://192.168.83.42/recognitionUrl'// 识别流地址
+    formData.value.rtspUrl = row.rtspUrl || 'http://192.168.83.42/rtsp' // rtsp地址
+    // formData.value.boundary = formData.value.boundary ? JSON.parse(formData.value.boundary) : formData.value.boundary // 识别边界
+    if (`${row.type}` === '0') { // 算法关联
+      formData.value.algoModelId = row.deviceModelRelations && row.deviceModelRelations.length && row.deviceModelRelations[0].algoModelId // 模型id
+      recognitionList.value = row.deviceModelRelations.map((item: any) => {
+        return {
+          ...item,
+          confidenceLevel: `${item.confidenceLevel}` ? Number(item.confidenceLevel) : undefined,
+          threshold: `${item.threshold}` ? Number(item.threshold) : undefined,
+        }
+      })
+
+      // 恢复选中状态
+      const selectedRows = recognitionList.value.filter((item: any) => `${item.isUse}` === '1')
+      if (selectedRows && Array.isArray(selectedRows) && selectedRows.length) {
+        nextTick(() => {
+          selectedRows.forEach((row: any) => {
+            algorithmTableRef.value?.toggleRowSelection(row, true)
+          })
+        })
+      }
+    }
+    else if (`${row.type}` === '1') { // 业务场景
+      formData.value.sceneId = row.sceneRelation.sceneId
+    }
+  }
+
+  if (dialogstatus === 'detail') {
+    formDataRef.value?.clearValidate()
+  }
+  dialogStatus.value = dialogstatus // 类型 新建add 编辑edit 详情detail
   btnLoading.value = false
 }
 
@@ -177,57 +230,73 @@
   resetForm()
   emits('closeRefresh')
 }
-// 关闭弹窗
-function dialogClose() {
-  dialogVisible.value = false
-  resetForm()
-  closeRefresh()
+
+// 监听算法变化，查询算法报警对象
+const changeAlgoModelId = (newValue: string) => {
+  if (newValue) {
+    // 获取场景对象
+    const params = {
+      modelId: newValue, // 模型ID
+      typeCode: '', // 类型编码
+      typeName: '', // 类型名称
+    }
+    getRecognitionList(params).then((res) => {
+      recognitionList.value = res.data.map((item: { id: string; typeName: string }) => {
+        return {
+          ...item,
+          recognitionTypeName: item.typeName,
+          recognitionTypeId: item.id,
+          id: '',
+        }
+      })
+    })
+  }
 }
 
-onMounted(() => {
-  fetchEdgeDeviceList() // 获取边缘设备列表
-  fetchSceneList() // 业务场景列表
-  fetchAlgorithmList() // 获取算法列表
-})
+const givePoints = (value: any) => {
+  formData.value.boundary = JSON.stringify(value)
+}
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
 </script>
 
 <template>
   <el-dialog
-    v-model="dialogVisible" :title="textMap[dialogStatus]" width="1200" :before-close="dialogClose" append-to-body
+    v-model="dialogVisible" :title="textMap[dialogStatus]" width="800" :before-close="closeRefresh" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
     <el-row :gutter="30">
-      <el-col :span="15">
+      <el-col :span="24">
         <el-form
           ref="formDataRef" :model="formData" :rules="rules" label-position="right" label-width="130px"
-          class="form-container" size="default" @submit.prevent
+          class="form-container" size="default" :disabled="dialogStatus === 'detail'" @submit.prevent
         >
           <el-row :gutter="10">
             <el-col :span="24" class="grid-cell">
-              <el-form-item label="关联边缘设备" prop="equipmentName" class="required">
+              <el-form-item label="关联边缘设备" prop="boxId" class="required">
                 <el-select
-                  v-model="formData.edgeDevice"
+                  v-model="formData.boxId"
                   placeholder="关联边缘设备"
                   clearable
                   filterable
+                  :disabled="dialogStatus === 'detail'"
                 >
-                  <el-option v-for="item of edgeDeviceList" :key="item.id" :label="item.equipmentName" :value="item.id" >
+                  <el-option v-for="item of edgeDeviceList" :key="item.id" :label="item.boxName" :value="item.id">
                     <div style="display: flex;justify-content: space-between;">
-                      <span style="font-weight: 600;">{{ item.equipmentName }}</span>
-                      <span style="color: #8492a6; font-size: 13px">{{ item.area }}</span>
-                      <span style="color: #8492a6; font-size: 13px">{{ item.deptName }}</span>
+                      <span style="font-weight: 600;">{{ item.boxName }}</span>
+                      <span style="color: #8492a6; font-size: 13px" :style="{ color: `${item.deviceStatus}` === '0' ? '#0e932e' : '#979797' }">{{ `${item.deviceStatus}` === '0' ? '在线' : '离线' }}</span>
+                      <span style="color: #8492a6; font-size: 13px">{{ item.ip }}</span>
                     </div>
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="14">
-              <el-form-item label="识别间隔(s)" prop="imageSaveInterval">
+              <el-form-item label="识别间隔(s)" prop="recognitionInterval">
                 <el-input-number
-                  v-model="formData.imageSaveInterval" class="full-width-input"
+                  v-model="formData.recognitionInterval" class="full-width-input"
                   :min="1" :precision="0" :step="1" placeholder="必填"
+                  :disabled="dialogStatus === 'detail'"
                 />
               </el-form-item>
             </el-col>
@@ -236,34 +305,53 @@
                 <el-input-number
                   v-model="formData.alarmInterval" class="full-width-input"
                   :min="1" :precision="0" :step="1" placeholder="必填"
+                  :disabled="dialogStatus === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="14">
+              <el-form-item label="rtsp地址" prop="rtspUrl">
+                <el-input
+                  v-model="formData.rtspUrl" class="full-width-input"
+                  placeholder="必填"
+                  :disabled="dialogStatus === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="14">
+              <el-form-item label="识别流地址 " prop="recognitionUrl">
+                <el-input
+                  v-model="formData.recognitionUrl" class="full-width-input"
+                  placeholder="必填"
+                  :disabled="dialogStatus === 'detail'"
                 />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="24">
-              <el-form-item label="场景模式" prop="mode">
-                <el-radio-group v-model="formData.mode">
-                  <el-radio label="2">
+              <el-form-item label="场景模式" prop="type">
+                <el-radio-group v-model="formData.type" :disabled="dialogStatus === 'detail'">
+                  <el-radio :label="1">
                     业务场景
                   </el-radio>
-                  <el-radio label="1">
+                  <el-radio :label="0">
                     算法关联
                   </el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="formData.mode === '2'" :gutter="24">
+          <el-row v-if="formData.type === 1" :gutter="24">
             <el-col :span="24">
-              <el-form-item label="业务场景" prop="relationSceneName">
+              <el-form-item label="业务场景" prop="sceneId">
                 <el-select
-                  v-model="formData.relationSceneName" placeholder="业务场景" clearable class="select"
-                  style="width: 100%;"
+                  v-model="formData.sceneId" placeholder="业务场景" clearable class="select"
+                  style="width: 100%;" :disabled="dialogStatus === 'detail'"
                 >
-                  <el-option v-for="item in sceneList" :key="item.id" :value="item.name" :label="item.name">
+                  <el-option v-for="item in sceneList" :key="item.id" :value="item.id" :label="item.sceneName">
                     <div style="display: flex;justify-content: space-between;">
-                      <span style="font-weight: 600;">{{ item.name }}</span>
+                      <span style="font-weight: 600;">{{ item.sceneName }}</span>
                       <span style="color: #8492a6; font-size: 13px">{{ item.version }}</span>
                     </div>
                   </el-option>
@@ -271,54 +359,74 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="formData.mode === '1'" :gutter="24">
+          <el-row v-if="formData.type === 0" :gutter="24">
             <el-col :span="24">
-              <el-form-item label="算法关联" prop="relationModelNames">
+              <el-form-item label="算法名称" prop="algoModelId">
+                <el-select
+                  v-model="formData.algoModelId" placeholder="请选择算法" clearable class="select"
+                  style="width: 100%;" :disabled="dialogStatus === 'detail'"
+                  @change="changeAlgoModelId"
+                >
+                  <el-option v-for="item in algorithmList" :key="item.id" :value="item.id" :label="item.modelName">
+                    <div style="display: flex;justify-content: space-between;">
+                      <span style="font-weight: 600;">{{ item.modelName }}</span>
+                      <span style="color: #8492a6; font-size: 13px">{{ item.version }}</span>
+                    </div>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="formData.type === 0" :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="报警对象">
                 <el-table
-                  ref="multipleTableRef" :data="algorithmList" border stripe style="width: 100%;"
+                  ref="algorithmTableRef" :data="recognitionList" border stripe style="width: 100%;"
                   max-height="400px" @selection-change="selectModel"
                 >
-                  <el-table-column label="算法名称" align="center" value="name">
-                    <template #default="scope">
-                      {{ scope.row.name }}
+                  <el-table-column
+                    v-for="item in columns"
+                    :key="item.value"
+                    :prop="item.value"
+                    :label="item.text"
+                    align="center"
+                  >
+                    <template #header>
+                      <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
                     </template>
-                  </el-table-column>
-                  <el-table-column label="置信度" align="center">
                     <template #default="scope">
                       <el-input-number
-                        v-model="scope.row.customThreshold"
-                        :min="1"
-                        :precision="0.01"
+                        v-if="dialogStatus !== 'detail' && (item.value === 'confidenceLevel' || item.value === 'threshold')"
+                        v-model="scope.row[item.value]"
+                        :min="0"
+                        :precision="2"
                         controls-position="right"
                       />
+                      <!-- <el-input-number v-if="item.value === 'threshold'" v-model="scope.row[item.value]" controls-position="right" :min="0" /> -->
+                      <span v-else>{{ scope.row[item.value] }}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column label="阈值" align="center">
-                    <template #default="scope">
-                      <el-input-number v-model="scope.row.customThreshold" controls-position="right" :min="0" />
-                    </template>
-                  </el-table-column>
-                  <el-table-column type="selection" width="55" align="center" />
+                  <el-table-column :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
                 </el-table>
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
       </el-col>
-      <el-col :span="8">
+      <!-- <el-col :span="8">
         <span style="display: block;font-weight: 600; margin-bottom: 6px;font-size: 14px;">区域绘制</span>
         <div id="draw-area" class="draw">
-          <draw-area />
-          <span style="margin-top: 10px;font-size: 11px;color: red;">注意：请绘制出一个四边形</span>
+          <draw-area :dialog-status="dialogStatus" @givePoints="givePoints"/>
+          <span v-if="dialogStatus !== 'detail'" style="margin-top: 10px;font-size: 11px;color: red;">注意：请绘制出一个四边形</span>
         </div>
-      </el-col>
+      </el-col> -->
     </el-row>
     <template #footer>
-      <div v-show="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button :loading="btnLoading" type="primary" @click="submitForm">
+      <div class="dialog-footer">
+        <el-button v-if="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
-        <el-button @click="dialogClose">
+        <el-button @click="closeRefresh">
           取消
         </el-button>
       </div>
diff --git a/src/views/alarm/policyConfig/monitorPoint/list.vue b/src/views/alarm/policyConfig/monitorPoint/list.vue
index 5c93a17..eb94812 100644
--- a/src/views/alarm/policyConfig/monitorPoint/list.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/list.vue
@@ -6,6 +6,7 @@
 import type { IList, IListQuery } from './monitorPoint-interface'
 import EditDialog from './editDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getMonitorPointList } from '@/api/alarm/policyConfig/monitorPoint'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
@@ -16,34 +17,33 @@
 const loading = ref(false)
 // 默认查询条件
 const listQuery: Ref<IListQuery> = ref({
-  equipmentName: '', // 设备名称
-  status: '', // 在线状态
+  deviceName: '', // 设备名称
+  deviceStatus: '', // 在线状态
   offset: 1,
   limit: 20,
 })
 // 表格表头
 const columns: Ref<TableColumn[]> = ref([
-  { text: '摄像头名称', value: 'equipmentName', align: 'center' },
-  { text: '摄像头编号', value: 'equipmentNo', align: 'center' },
+  { text: '摄像头名称', value: 'deviceName', align: 'center' },
+  { text: '摄像头编号', value: 'deviceNo', align: 'center' },
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '关联边缘设备', value: 'edgeDevice', align: 'center' },
-  { text: 'RTSP地址', value: 'rtsp', align: 'center' },
-  { text: '识别间隔(s)', value: 'imageSaveInterval', align: 'center' },
+  { text: '关联边缘设备', value: 'boxName', align: 'center' },
+  { text: 'RTSP地址', value: 'rtspUrl', align: 'center' },
+  { text: '识别间隔(s)', value: 'recognitionInterval', align: 'center' },
   { text: '告警间隔(s)', value: 'alarmInterval', align: 'center' },
-  { text: '业务场景', value: 'relationSceneName', align: 'center' },
-  { text: '报警对象', value: 'relationModelNames', align: 'center' },
-  // { text: '在线状态', value: 'status', align: 'center' },
+  { text: '业务场景', value: 'typeName', align: 'center' },
+  { text: '报警对象', value: 'recognitionTypeName', align: 'center' },
 ])
 const total = ref(0) // 数据条数
 const list = ref<IList[]>([]) // 数据条数
 const checkoutList = ref<IList[]>([]) // 数据条数
 
 // ------------------------------------字典------------------------------------------
-const statusList = ref<dictType[]>([]) // 在线状态
+const deviceStatusList = ref<dictType[]>([]) // 在线状态
 const getDict = () => {
   // 在线状态
   getDictByCode('status').then((response) => {
-    statusList.value = response.data
+    deviceStatusList.value = response.data
   })
 }
 getDict()
@@ -52,52 +52,26 @@
 // 查询数据
 const fetchData = () => {
   loading.value = true
-  // getDevListPage(listQuery).then((res: { data: { rows: []; total: number } }) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loading.value = false
-  // })
-  list.value = [{
-    id: '1',
-    equipmentName: '测试数据1', // 设备名称
-    equipmentNo: '测试数据1', // 设备编号
-    // area: '测试数据1', // 所属区域
-    deptName: '测试数据1', // 所属单位
-    edgeDevice: '测试数据1', // 关联边缘设备
-    rtsp: '测试数据1', // RTSP地址
-    imageSaveInterval: 20, // 识别间隔
-    alarmInterval: 20, // 告警间隔
-    relationSceneName: '测试数据1', // 业务场景
-    relationModelNames: '测试数据1', // 报警对象
-    mode: '1',
-    status: '在线', // 在线状态
-    deptId: '测试数据1', // 所属单位id
-  },
-  {
-    id: '2',
-    equipmentName: '测试数据2', // 设备名称
-    equipmentNo: '测试数据2', // 设备编号
-    // area: '测试数据2', // 所属区域
-    deptName: '测试数据2', // 所属单位
-    edgeDevice: '测试数据2', // 关联边缘设备
-    rtsp: '测试数据2', // RTSP地址
-    imageSaveInterval: 20, // 识别间隔
-    alarmInterval: 20, // 告警间隔
-    mode: '2',
-    relationSceneName: '测试数据2', // 业务场景
-    relationModelNames: '测试数据2', // 报警对象
-    status: '离线', // 在线状态
-    deptId: '测试数据2', // 所属单位id
-  },
-  ]
+  getMonitorPointList(listQuery.value).then((res: { data: { rows: []; total: number } }) => {
+    list.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        typeName: `${item.type}` === '1' ? item.sceneRelation.sceneName : '/', // 业务场景
+        recognitionTypeName: `${item.type}` === '0' ? item.deviceModelRelations.map((i: { recognitionTypeName: any }) => i.recognitionTypeName).join(',') : '/', // 报警对象
+      }
+    })
+    total.value = res.data.total
+    loading.value = false
+  })
+
   loading.value = false
 }
 
 // 搜索重置
 const reset = () => {
   listQuery.value = {
-    equipmentName: '', // 设备名称
-    status: '', // 在线状态
+    deviceName: '', // 设备名称
+    deviceStatus: '', // 在线状态
     offset: 1,
     limit: 20,
   }
@@ -120,7 +94,7 @@
 // 删除
 const del = (row: IList) => {
   ElMessageBox.confirm(
-    `确定要删除${row.equipmentName}吗？`,
+    `确定要删除${row.deviceName}吗？`,
     '确认删除',
     {
       confirmButtonText: '确定',
@@ -156,31 +130,38 @@
   <app-container>
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.equipmentName" placeholder="设备名称" clearable style="width: 200px;" @change="search" />
+        <el-input v-model="listQuery.deviceName" placeholder="摄像头名称" clearable style="width: 200px;" @change="search" />
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.status"
+          v-model="listQuery.deviceStatus"
           placeholder="在线状态"
           style="width: 220px;"
           clearable
           @change="search"
         >
-          <el-option v-for="item of statusList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-option v-for="item of deviceStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <normal-table :query="listQuery" :list-loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="在线状态" align="center" width="120">
             <template #default="scope">
-              <el-tag :type="scope.row.status === '在线' ? 'success' : 'danger'">
-                {{ scope.row.status }}
+              <el-tag v-if="scope.row.deviceStatusName" :type="scope.row.deviceStatusName === '在线' ? 'success' : 'danger'">
+                {{ scope.row.deviceStatusName }}
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="120" align="center">
+          <el-table-column label="操作" width="120" align="center" fixed="right">
             <template #default="scope">
               <el-button type="primary" link size="small" class="table-text-button" @click="detail(scope.row)">
                 详情
diff --git a/src/views/alarm/policyConfig/monitorPoint/monitorPoint-interface.ts b/src/views/alarm/policyConfig/monitorPoint/monitorPoint-interface.ts
index f8d031a..144dc5c 100644
--- a/src/views/alarm/policyConfig/monitorPoint/monitorPoint-interface.ts
+++ b/src/views/alarm/policyConfig/monitorPoint/monitorPoint-interface.ts
@@ -1,33 +1,44 @@
 export interface IListQuery {
-  equipmentName: string // 设备名称
-  status: string // 在线状态
+  deviceName: string // 设备名称
+  deviceStatus: string // 在线状态
   offset: number
   limit: number
 }
 
 export interface IList {
   id: string // 主键
-  equipmentName: string // 设备名称
+  deviceName: string // 设备名称
   equipmentNo: string // 设备编号
   // area: string // 所属区域
   deptName: string // 所属单位
   edgeDevice: string // 关联边缘设备
   rtsp: string // RTSP地址
   imageSaveInterval: number // 识别间隔
-  alarmInterval: number // 告警间隔
   relationSceneName: string // 业务场景
   mode: string // 场景模式
   relationModelNames: string // 报警对象
-  status: string // 在线状态
+  deviceStatus: string // 在线状态
   deptId?: string // 所属单位id
+
+  boxId: string // 边缘设备id
+  deviceId: string // 设备id
+  recognitionInterval: number // 识别间隔
+  alarmInterval: number // 告警间隔
+  type: number // 场景模式
 }
 
 export interface IForm {
-  id: string // 数据id
-  edgeDevice: string // 关联边缘设备
-  imageSaveInterval: number // 识别间隔
+  id: string
+  boxId: string // 关联边缘设备id
+  deviceId: string // 设备id
+  recognitionInterval: number // 识别间隔
   alarmInterval: number // 告警间隔
-  mode: string // 场景模式
-  relationSceneName: string // 业务场景
-  relationModelNames: string // 报警对象/算法关联
+  type: number // 场景模式
+
+  sceneId: string // 业务场景id
+  algoModelId: string // 模型id
+
+  recognitionUrl: string // 识别流地址
+  rtspUrl: string // rtsp地址
+  boundary: string // 识别边界
 }

diff --git a/public/config/config.json b/public/config/config.json
index a85fc42..29161c3 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -10,5 +10,5 @@
   "maxZoom": "13",
   "zoom": "10",
   "timeGap": 3000,
-  "systemType": "sm"
+  "systemType": "gm"
 }
diff --git a/src/api/alarm/dangerAssessment/manage.ts b/src/api/alarm/dangerAssessment/manage.ts
new file mode 100644
index 0000000..dae1056
--- /dev/null
+++ b/src/api/alarm/dangerAssessment/manage.ts
@@ -0,0 +1,50 @@
+/**
+ * 安全生产隐患管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getDangerAssessmentManageList(data: any) {
+  return request({
+    url: 'risk/listPage',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 详情
+export function getDangerAssessmentManageDetail(data: { id: string }) {
+  return request({
+    url: 'risk/detail',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 新增
+export function addDangerAssessmentManage(data: object) {
+  return request({
+    url: 'risk/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateDangerAssessmentManage(data: object) {
+  return request({
+    url: 'risk/update',
+    method: 'post',
+    data,
+  })
+}
+
+// 批量导入
+export function batchImport(data: object) {
+  return request({
+    url: 'risk/batchImport',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/alarm/policyConfig/monitorPoint.ts b/src/api/alarm/policyConfig/monitorPoint.ts
new file mode 100644
index 0000000..e4cd648
--- /dev/null
+++ b/src/api/alarm/policyConfig/monitorPoint.ts
@@ -0,0 +1,68 @@
+/**
+ * 监控点位管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getMonitorPointList(data: any) {
+  return request({
+    url: 'device/relation/listPage',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 详情
+export function getMonitorPointDetail(data: { id: string }) {
+  return request({
+    url: 'device/relation/detail',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 编辑
+export function updateMonitorPoint(data: object) {
+  return request({
+    url: 'device/relation/update',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取盒子列表
+export function getBoxList(data: any) {
+  return request({
+    url: 'device/box/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 获取算法列表
+export function getModelList(data: any) {
+  return request({
+    url: 'device/model/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 获取算法-场景对象列表
+export function getSceneList(data: any) {
+  return request({
+    url: 'scene/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 算法报警对象
+export function getRecognitionList(data: any) {
+  return request({
+    url: 'device/recognitionType/recognitionList',
+    method: 'get',
+    params: data,
+  })
+}
+
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 04b39cc..92165e1 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -40,7 +40,7 @@
     default: 'default',
   }, // 输入框大小
 })
-const emit = defineEmits(['update:modelValue'])
+const emit = defineEmits(['update:modelValue', 'changeDept'])
 // ------------定义props参数----------
 const value = computed({
   get() {
@@ -153,6 +153,10 @@
     return []
   }
 }
+
+const changeDept = (val: any) => {
+  emit('changeDept', val)
+}
 // --------暴露方法
 defineExpose({ refreshTree, fetchDeptTree, findChildren })
 </script>
@@ -176,6 +180,7 @@
       filterable
       class="full-width-input"
       :disabled="props.disabled"
+      @change="changeDept"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index d1f5b24..e3d6460 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -8,5 +8,6 @@
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
   fixed?: boolean // 固定列
+  required?: boolean // 是否必填
 }
 
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
index 31a16b9..fb5f8ac 100644
--- a/src/utils/useCheckList.ts
+++ b/src/utils/useCheckList.ts
@@ -1,5 +1,4 @@
 import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 
 /**
  * 检查列表
@@ -7,13 +6,14 @@
  * @param columns // 表头信息
  * @param tableTitle // 表格名称
  */
-export function useCheckList(list: { [key: string]: string }[], columns: TableColumn, tableTitle = '') {
+export function useCheckList(list: { [key: string]: string }[], columns: any, tableTitle = '') {
   for (let index = 0; index < list.length; index++) {
     const item = list[index]
     for (const prop of columns) {
       // 检查必填
       if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        // ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        ElMessage.warning(`请先完善${tableTitle}中【${item.typeName}】的${prop.text}`)
         return false
       }
       // 验证正则
diff --git a/src/views/alarm/dangerAssessment/manage/editPointDialog.vue b/src/views/alarm/dangerAssessment/manage/editPointDialog.vue
new file mode 100644
index 0000000..db4b29f
--- /dev/null
+++ b/src/views/alarm/dangerAssessment/manage/editPointDialog.vue
@@ -0,0 +1,219 @@
+<!-- 新增、编辑危险点 -->
+<script lang="ts" setup name="EditPointDialog">
+import { reactive, ref } from 'vue'
+import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { addDangerAssessmentManage, updateDangerAssessmentManage } from '@/api/alarm/dangerAssessment/manage'
+const emits = defineEmits(['closeRefresh'])
+const dialogStatus = ref('add')
+const dialogVisible = ref(false) // 弹窗显示隐藏
+// 显示标题
+const textMap: { [key: string]: string } = {
+  detail: '详情',
+  edit: '编辑',
+  add: '新增',
+}
+
+// 表单数据对象
+const formData = ref({
+  id: '',
+  deptId: '', // 所属单位id
+  deptName: '', // 所属单位
+  riskName: '', // 危险点名称
+  address: '', // 详细地址
+  content: '', // 作业活动概述
+  nature: '', // 危险性质
+  grade: '', // 等级
+  assignPost: '', // 定岗
+  staffQuota: 1, // 定员
+  substancesQuantities: '', // 危险物质及定量
+})
+const btnLoading = ref(false) // 保存按钮加载状态
+const formDataRef = ref<FormInstance>() // 表单对象
+// 校验规则
+const rules = reactive<FormRules>({
+  deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
+  riskName: [{ required: true, message: '危险点名称必填', trigger: ['blur', 'change'] }],
+  address: [{ required: true, message: '详细地址必填', trigger: ['blur', 'change'] }],
+  content: [{ required: true, message: '作业活动概述必填', trigger: ['blur', 'change'] }],
+  nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
+  grade: [{ required: true, message: '等级必填', trigger: ['blur', 'change'] }],
+  assignPost: [{ required: true, message: '定岗必填', trigger: ['blur', 'change'] }],
+  staffQuota: [{ required: true, message: '定员必填', trigger: ['blur', 'change'] }],
+  substancesQuantities: [{ required: true, message: '危险物质及定量必填', trigger: ['blur', 'change'] }],
+})
+
+// -----------------------------------------字典--------------------------------------------------------------
+const deviceStatusList = ref<dictType[]>([]) // 危险点等级
+const getDict = async () => {
+  // 危险点等级
+  getDictByCode('dangerPointGrade').then((response) => {
+    deviceStatusList.value = response.data
+  })
+}
+getDict()
+// -------------------------------------------------------------------------------------------
+// 表单提交
+function submitForm() {
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.warning('新增危险点成功')
+            return false
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.warning('编辑危险点成功')
+            return false
+          })
+        }
+      }
+    })
+  }
+}
+
+// 重置表单
+function resetForm() {
+  formData.value = {
+    id: '',
+    deptId: '', // 所属单位id
+    deptName: '', // 所属单位
+    riskName: '', // 危险点名称
+    address: '', // 详细地址
+    content: '', // 作业活动概述
+    nature: '', // 危险性质
+    grade: '', // 等级
+    assignPost: '', // 定岗
+    staffQuota: 1, // 定员
+    substancesQuantities: '', // 危险物质及定量
+  }
+}
+
+// -----------------------------------初始化、关闭对话框相关-----------------------------------------
+function initDialog(dialogstatus: string, row: any) {
+  dialogVisible.value = true
+  if (dialogstatus === 'edit' || dialogstatus === 'detail') {
+    formData.value.id = row.id
+    formData.value.deptId = row.deptId // 所属单位id
+    formData.value.deptName = row.deptName // 所属单位
+    formData.value.riskName = row.riskName // 危险点名称
+    formData.value.address = row.address // 详细地址
+    formData.value.content = row.content // 作业活动概述
+    formData.value.nature = row.nature // 危险性质
+    formData.value.grade = row.grade // 等级
+    formData.value.assignPost = row.assignPost // 定岗
+    formData.value.staffQuota = Number(row.staffQuota) // 定员
+    formData.value.substancesQuantities = row.substancesQuantities // 危险物质及定量
+  }
+
+  // 详情隐藏表单校验
+  if (dialogstatus === 'detail') {
+    formDataRef.value?.clearValidate()
+  }
+  dialogStatus.value = dialogstatus // 类型 新建add 编辑edit 详情detail
+  btnLoading.value = false
+}
+
+// 关闭并刷新
+function closeRefresh() {
+  dialogVisible.value = false
+  resetForm()
+  emits('closeRefresh')
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible" :title="textMap[dialogStatus]" width="800" :before-close="closeRefresh" append-to-body
+    :open-delay="0" :close-on-click-modal="false"
+  >
+    <el-form
+      ref="formDataRef" :model="formData" :rules="rules" label-position="right" label-width="130px"
+      class="form-container" size="default" :disabled="dialogStatus === 'detail'" @submit.prevent
+    >
+      <el-row :gutter="10">
+        <el-col :span="12">
+          <el-form-item label="所属单位" prop="deptId">
+            <dept-select v-model="formData.deptId" placeholder="必选" :disabled="dialogStatus === 'detail'" :dept-show="true" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="危险源名称" prop="riskName">
+            <el-input :value="formData.riskName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="详细地址" prop="address">
+            <el-input :value="formData.address" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="作业活动概述" prop="content">
+            <el-input :value="formData.content" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="危险性质" prop="nature">
+            <el-input :value="formData.nature" :disabled="dialogStatus === 'detail'" type="text" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="等级" prop="grade">
+            <el-select
+              v-model="formData.grade"
+              placeholder="必选"
+              clearable
+              filterable
+              :disabled="dialogStatus === 'detail'"
+            >
+              <el-option v-for="item of deviceStatusList" :key="item.id" :label="item.name" :value="item.name "/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="定岗" prop="assignPost">
+            <el-input :value="formData.assignPost" :disabled="dialogStatus === 'detail'" type="text" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="定员" prop="staffQuota">
+            <el-input-number
+              v-model="formData.staffQuota" class="full-width-input"
+              :min="1" :precision="0" :step="1" placeholder="必填"
+              :disabled="dialogStatus === 'detail'"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="危险物质及定量" prop="substancesQuantities">
+            <el-input :value="formData.substancesQuantities" :disabled="dialogStatus === 'detail'" type="text" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button v-if="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button @click="closeRefresh">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//
+</style>
diff --git a/src/views/alarm/dangerAssessment/manage/list.vue b/src/views/alarm/dangerAssessment/manage/list.vue
index a1b6214..3e27450 100644
--- a/src/views/alarm/dangerAssessment/manage/list.vue
+++ b/src/views/alarm/dangerAssessment/manage/list.vue
@@ -5,61 +5,112 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IList, IListQuery } from './manage-interface'
 // import EditDialog from './editDialog.vue'
+import editPointDialog from './editPointDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { uploadApi } from '@/api/monitor/dev'
 import { getDictByCode } from '@/api/system/dict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { dictType } from '@/global'
+import { getDangerAssessmentManageList } from '@/api/alarm/dangerAssessment/manage'
 const { proxy } = getCurrentInstance() as any
 const editDialogRef = ref() // 组件
 const router = useRouter()
 // 文件上传input
 const fileRef = ref()
 const loading = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// ------------------------------------------------------------------------------------------
 // 默认查询条件
 const listQuery: Ref<IListQuery> = ref({
   area: '', // 所属区域
-  deptId: '', // 所属区域
-  dangerCategory: '', // 隐患分类
-  startTime: '', // 开始时间
-  endTime: '', // 结束时间
+  deptId: '', // 所属组织
+  riskName: '', // 危险点名称
+  riskType: '', // 危险点类型
   offset: 1,
   limit: 20,
 })
-// 表格表头
-const columns: Ref<TableColumn[]> = ref([
-  { text: '所属区域', value: 'area', align: 'center' },
+// ------------------------------------------表头---------------------------------------------
+const columns: Ref<TableColumn[]> = ref([]) // 表头
+// 危险点
+const columnsPoint: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '业务内容', value: 'businessContent', align: 'center' },
-  { text: '隐患分类Ⅰ', value: 'yhfl1', align: 'center' },
-  { text: '隐患分类Ⅱ', value: 'yhfl2', align: 'center' },
-  { text: '监控相机', value: 'equipmentName', align: 'center' },
-  { text: '录入时间', value: 'time', align: 'center' },
-  { text: '备注', value: 'remark', align: 'center' },
-])
+  { text: '危险点名称', value: 'riskName', align: 'center' },
+  { text: '详细地址', value: 'address', align: 'center' },
+  { text: '作业活动概述', value: 'content', align: 'center' },
+  { text: '危险性质', value: 'nature', align: 'center' },
+  { text: '等级', value: 'grade', align: 'center' },
+  { text: '定岗', value: 'assignPost', align: 'center' },
+  { text: '定员', value: 'staffQuota', align: 'center' },
+  { text: '危险物质及定量', value: 'substancesQuantities', align: 'center' },
+]
+// 重大危险源
+const columnsSource: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险源名称', value: 'businessContent', align: 'center' },
+  { text: '场所级别', value: 'yhfl1', align: 'center' },
+  { text: '危险化学品名称', value: 'yhfl2', align: 'center' },
+  { text: '危险性质', value: 'equipmentName', align: 'center' },
+  { text: '存量', value: 'time', align: 'center' },
+  { text: '临界量', value: 'remark', align: 'center' },
+  { text: '分级指数', value: 'remark', align: 'center' },
+  { text: '危险物质及定量', value: 'remark', align: 'center' },
+  { text: '危险源等级', value: 'remark', align: 'center' },
+]
+// 危险化学品场所
+const columnsChemistry: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险化学品场所', value: 'businessContent', align: 'center' },
+  { text: '场所分类', value: 'yhfl1', align: 'center' },
+  { text: '作业活动', value: 'yhfl2', align: 'center' },
+  { text: '危化品名称', value: 'equipmentName', align: 'center' },
+  { text: '危险性质', value: 'time', align: 'center' },
+  { text: '定岗', value: 'remark', align: 'center' },
+  { text: '定员', value: 'remark', align: 'center' },
+  { text: '定量', value: 'remark', align: 'center' },
+  { text: '定寿命', value: 'remark', align: 'center' },
+  { text: '定检', value: 'remark', align: 'center' },
+]
+// 危险作业
+const columnsWork: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险作业', value: 'businessContent', align: 'center' },
+  { text: '危险作业等级', value: 'yhfl1', align: 'center' },
+  { text: '主要危险描述', value: 'yhfl2', align: 'center' },
+  { text: '相关部门', value: 'equipmentName', align: 'center' },
+  { text: '作业频次', value: 'time', align: 'center' },
+]
+// 危险作业工序
+const columnsWorkProcesses: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险作业工序', value: 'businessContent', align: 'center' },
+  { text: '作业人员数量', value: 'yhfl1', align: 'center' },
+  { text: '事故类型', value: 'yhfl2', align: 'center' },
+]
+// -------------------------------------------------------------------------------------------
 const total = ref(0) // 数据条数
-const list = ref<IList[]>([]) // 数据条数
-const checkoutList = ref<IList[]>([]) // 数据条数
-// 开始结束时间
-const datetimerange = ref()
-watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
-  if (Array.isArray(newVal)) {
-    if (newVal.length) {
-      listQuery.value.startTime = `${newVal[0]} 00:00:00`
-      listQuery.value.endTime = `${newVal[1]} 23:59:59`
+const list = ref([]) // 数据条数
+const checkoutList = ref([]) // 数据条数
+
+const editPointDialogRef = ref() // 危险点ref
+// -----------------------------------------字典--------------------------------------------------------------
+// 查询字典
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('dangerAssessmentType')
+  // 制作右上角的菜单
+  const tempMenu = ['重大危险源', '危险点', '危险化学品场所', '危险作业', '危险作业工序']
+  tempMenu.forEach((item) => {
+    const tempFindData = res.data.find((e: { name: string; value: string }) => e.name === item)
+    if (tempFindData) {
+      menu.value.push({
+        name: tempFindData.name,
+        id: `${tempFindData.value}`,
+      })
     }
-  }
-})
-// ------------------------------------字典------------------------------------------
-// const statusList = ref<dictType[]>([]) // 在线状态
-const getDict = () => {
-  // // 在线状态
-  // getDictByCode('status').then((response) => {
-  //   statusList.value = response.data
-  // })
+  })
 }
-getDict()
 // -----------------------------------文件上传-------------------------------------------
 // 点击批量导入
 const batchImport = () => {
@@ -101,34 +152,12 @@
 // 查询数据
 const fetchData = () => {
   loading.value = true
-  // getDevListPage(listQuery).then((res: { data: { rows: []; total: number } }) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loading.value = false
-  // })
-  list.value = [{
-    id: '1',
-    area: '测试数据1', // 设备名称
-    deptName: '测试数据1', // 设备编号
-    businessContent: '测试数据1', // 所属单位
-    yhfl1: '测试数据1', // RTSP地址
-    yhfl2: '测试数据1', // 识别间隔
-    equipmentName: '测试数据1', // 告警间隔
-    time: '2021-11-11',
-    remark: '测试数据1', // 业务场景
-  },
-  {
-    id: '2',
-    area: '测试数据2', // 设备名称
-    deptName: '测试数据2', // 设备编号
-    businessContent: '测试数据2', // 所属单位
-    yhfl1: '测试数据2', // RTSP地址
-    yhfl2: '测试数据2', // 识别间隔
-    equipmentName: '测试数据2', // 告警间隔
-    time: '2022-09-08',
-    remark: '测试数据2', // 业务场景
-  },
-  ]
+  listQuery.value.riskType = active.value // 危险点类型
+  getDangerAssessmentManageList(listQuery.value).then((res: { data: { rows: []; total: number } }) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    loading.value = false
+  })
   loading.value = false
 }
 
@@ -136,14 +165,12 @@
 const reset = () => {
   listQuery.value = {
     area: '', // 所属区域
-    deptId: '', // 所属区域
-    dangerCategory: '', // 隐患分类
-    startTime: '', // 开始时间
-    endTime: '', // 结束时间
+    deptId: '', // 所属组织
+    riskName: '', // 危险点名称
+    riskType: '', // 危险点类型
     offset: 1,
     limit: 20,
   }
-  datetimerange.value = []
   fetchData()
 }
 
@@ -154,17 +181,57 @@
 
 // 新增
 const add = (row: IList) => {
-  ElMessage.info('敬请期待')
+  switch (active.value) {
+    case '1': // 危险点
+      editPointDialogRef.value.initDialog('add')
+      break
+    case '2': // 重大危险源
+      break
+    case '3': // 危险化学品场所
+      break
+    case '4': // 危险作业
+      break
+    case '5': // 危险作业工序
+      break
+  }
   // editDialogRef.value.initDialog('add')
 }
 // 详情
 const detail = (row: IList) => {
-  editDialogRef.value.initDialog('detail', row)
+  switch (active.value) {
+    case '1': // 危险点
+      editPointDialogRef.value.initDialog('detail', row)
+      break
+    case '2': // 重大危险源
+      break
+    case '3': // 危险化学品场所
+      break
+    case '4': // 危险作业
+      break
+    case '5': // 危险作业工序
+      break
+  }
+}
+// 编辑
+const edit = (row: IList) => {
+  switch (active.value) {
+    case '1': // 危险点
+      editPointDialogRef.value.initDialog('edit', row)
+      break
+    case '2': // 重大危险源
+      break
+    case '3': // 危险化学品场所
+      break
+    case '4': // 危险作业
+      break
+    case '5': // 危险作业工序
+      break
+  }
 }
 // 删除
 const del = (row: IList) => {
   ElMessageBox.confirm(
-    `确定要删除${row.equipmentName}吗？`,
+    '确定删除吗？',
     '确认删除',
     {
       confirmButtonText: '确定',
@@ -191,7 +258,39 @@
   fetchData()
 }
 
-onMounted(() => {
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  reset()
+}
+
+watch(() => active.value, (newValue) => {
+  console.log(newValue)
+  switch (newValue) {
+    case '1': // 危险点
+      columns.value = columnsPoint
+      break
+    case '2': // 重大危险源
+      columns.value = columnsSource
+      break
+    case '3': // 危险化学品场所
+      columns.value = columnsChemistry
+      break
+    case '4': // 危险作业
+      columns.value = columnsWork
+      break
+    case '5': // 危险作业工序
+      columns.value = columnsWorkProcesses
+      break
+    default:
+      columns.value = columnsPoint
+      break
+  }
+}, { immediate: true })
+
+onMounted(async () => {
+  await getDict()
+  active.value = '1'
   fetchData()
 })
 </script>
@@ -200,19 +299,10 @@
   <app-container>
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.area" placeholder="所属区域" clearable style="width: 200px;" @change="search" />
+        <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search" @changeDept="search"/>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search" />
-      </search-item>
-      <search-item>
-        <el-input v-model="listQuery.dangerCategory" placeholder="隐患分类" clearable style="width: 200px;" @change="search" />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
-          range-separator="至" start-placeholder="录入时间(开始)" end-placeholder="录入时间(结束)" @change="search"
-        />
+        <el-input v-model="listQuery.riskName" placeholder="危险点名称" clearable style="width: 200px;" />
       </search-item>
     </search-area>
     <table-container>
@@ -222,12 +312,22 @@
       </template>
       <input v-show="false" ref="fileRef" type="file" accept="xlsx/*" @change="onFileChange">
       <normal-table :query="listQuery" :list-loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" width="120" align="center">
+          <el-table-column label="操作" width="150" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" class="table-text-button" @click="detail(scope.row)">
                 详情
               </el-button>
+              <el-button type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
+                编辑
+              </el-button>
               <el-button type="danger" link size="small" class="table-text-button" @click="del(scope.row)">
                 删除
               </el-button>
@@ -237,5 +337,9 @@
       </normal-table>
     </table-container>
     <edit-dialog ref="editDialogRef" @close-refresh="search" />
+    <!-- 编辑危险点 -->
+    <edit-point-dialog ref="editPointDialogRef" />
+    <!-- 右上角按钮集合 -->
+    <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
   </app-container>
 </template>
diff --git a/src/views/alarm/dangerAssessment/manage/manage-interface.ts b/src/views/alarm/dangerAssessment/manage/manage-interface.ts
index e19c1be..3740441 100644
--- a/src/views/alarm/dangerAssessment/manage/manage-interface.ts
+++ b/src/views/alarm/dangerAssessment/manage/manage-interface.ts
@@ -1,9 +1,8 @@
 export interface IListQuery {
   area: string // 所属区域
-  deptId: string // 所属区域
-  dangerCategory: string // 隐患分类
-  startTime: string // 开始时间
-  endTime: string // 结束时间
+  deptId: string // 所属组织
+  riskName: string // 危险点名称
+  riskType: string // 危险点类型
   offset: number
   limit: number
 }
diff --git a/src/views/alarm/policyConfig/monitorPoint/drawArea.vue b/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
index e902322..6e72273 100644
--- a/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
@@ -1,4 +1,10 @@
 <script lang="ts" setup name="DrawArea">
+const props = defineProps({
+  dialogStatus: {
+    type: String,
+  },
+})
+const emits = defineEmits(['givePoints'])
 const points = ref([ // 标记点初始
   { x: 50, y: 50 }, // 左上
   { x: 150, y: 50 },
@@ -25,6 +31,9 @@
   }
 
   function drag(e: any, pointIndex: number) {
+    if (props.dialogStatus === 'detail') {
+      return
+    }
     e = e || window.event
     e.preventDefault()
     var mousePos = { x: e.clientX - canvas.getBoundingClientRect().left, y: e.clientY - canvas.getBoundingClientRect().top }
@@ -48,6 +57,9 @@
   }
 
   function addDragEvents() {
+    if (props.dialogStatus === 'detail') {
+      return
+    }
     var dragEvents = {
       dragStart(e: any) {
         e = e || window.event
@@ -98,6 +110,7 @@
 ])
 
 watch(() => points.value, () => {
+  emits('givePoints', points.value)
   style.value = [
     {
       top: `${points.value[0].y - 5}px`,
@@ -124,7 +137,7 @@
 <template>
   <div style="width: 400px;height: 300px;">
     <canvas id="myCanvas" width="400" height="300" class="canvans" />
-    <div v-for="(item, index) in points" :key="index" class="point" :style="style[index]" />
+    <div v-for="(item, index) in points" :key="index" :class="props.dialogStatus === 'detail' ? 'detail-point' : 'point'" :style="style[index]" />
   </div>
 </template>
 
@@ -158,4 +171,19 @@
     cursor: move;
   }
 }
+.detail-point {
+  width: 10px;
+  height: 10px;
+  position: absolute;
+  border-radius: 50%;
+  background-color: red;
+  opacity: 0.5;
+  top: 0;
+  left: 0;
+  z-index: 99;
+
+  &:hover {
+    cursor: not-allowed
+  }
+}
 </style>
diff --git a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
index 5a6a046..36618a7 100644
--- a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
@@ -4,13 +4,12 @@
 import { nextTick, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import type { IList as IEdgeDeviceList } from '../edgeDevice/edgeDevice-interface'
-import type { IList as ISceneList } from '../../library/scene/scene-interface'
-import type { IList as IAlgorithmList } from '../../library/algorithm/algorithm-interface'
 import type { IForm, IList } from './monitorPoint-interface'
 import drawArea from './drawArea.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { isIp } from '@/utils/validate'
-import { getDictByCode } from '@/api/system/dict'
+import { useCheckList } from '@/utils/useCheckList'
+import { getBoxList, getModelList, getRecognitionList, getSceneList, updateMonitorPoint } from '@/api/alarm/policyConfig/monitorPoint'
 const emits = defineEmits(['closeRefresh'])
 const dialogStatus = ref('add')
 const dialogVisible = ref(false) // 弹窗显示隐藏
@@ -24,121 +23,127 @@
 // 表单数据对象
 const formData: Ref<IForm> = ref({
   id: '',
-  edgeDevice: '', // 关联边缘设备
-  imageSaveInterval: 60, // 识别间隔
+  boxId: '', // 关联边缘设备id
+  deviceId: '', // 设备id
+  recognitionInterval: 60, // 识别间隔
   alarmInterval: 60, // 告警间隔
-  mode: '', // 场景模式
-  relationSceneName: '', // 业务场景
-  relationModelNames: '', // 报警对象/算法关联
-})
+  type: 1, // 场景模式
 
+  sceneId: '', // 业务场景id
+  algoModelId: '', // 模型id
+
+  recognitionUrl: '', // 识别流地址
+  rtspUrl: '', // rtsp地址
+  boundary: '', // 识别边界
+})
+const selectModelList = ref<any[]>([]) // 选择的算法
+const algorithmTableRef = ref()
 const btnLoading = ref(false) // 保存按钮加载状态
 const formDataRef = ref<FormInstance>() // 表单对象
-
-const isIpV = (rule: any, value: any, callback: any) => {
-  if (value === '') {
-    callback(new Error('ip地址必填!'))
-  }
-  else if (isIp(value)) {
-    callback()
-  }
-  else {
-    callback(new Error('IP不合法'))
-  }
-  callback()
-}
 // 校验规则
 const rules = reactive<FormRules>({
-  equipmentName: [{ required: true, message: '关联边缘设备必选', trigger: ['blur', 'change'] }],
-  imageSaveInterval: [{ required: true, message: '识别间隔必填', trigger: ['blur', 'change'] }],
+  boxId: [{ required: true, message: '关联边缘设备必选', trigger: ['blur', 'change'] }],
+  recognitionInterval: [{ required: true, message: '识别间隔必填', trigger: ['blur', 'change'] }],
   alarmInterval: [{ required: true, message: '告警间隔必填', trigger: ['blur', 'change'] }],
-  mode: [{ required: true, message: '场景模式必选', trigger: ['blur', 'change'] }],
-  relationSceneName: [{ required: true, message: '业务场景必选', trigger: ['blur', 'change'] }],
-  relationModelNames: [{ required: true, message: '报警对象必选', trigger: ['blur', 'change'] }],
+  type: [{ required: true, message: '场景模式必选', trigger: ['blur', 'change'] }],
+  sceneId: [{ required: true, message: '业务场景必选', trigger: ['blur', 'change'] }],
+  algoModelId: [{ required: true, message: '算法名称必选', trigger: ['blur', 'change'] }],
+  recognitionUrl: [{ required: true, message: '识别流地址必填', trigger: ['blur', 'change'] }],
+  rtspUrl: [{ required: true, message: 'rtsp地址必填', trigger: ['blur', 'change'] }],
 })
 
+// 算法表格表头
+const columns = ref<TableColumn[]>([
+  { text: '名称', value: 'recognitionTypeName', align: 'center', required: false },
+  { text: '置信度', value: 'confidenceLevel', align: 'center', required: true },
+  { text: '阈值', value: 'threshold', align: 'center', required: true },
+])
+
 // -------------------------------------------------------------------------------------------
-const edgeDeviceList = ref<IEdgeDeviceList[]>([]) // 边缘设备列表
-const sceneList = ref<ISceneList[]>([]) // 业务场景列表
-const algorithmList = ref<IAlgorithmList[]>([]) // 算法列表
+const edgeDeviceList: any = ref([]) // 边缘设备列表
+const sceneList: any = ref([]) // 业务场景列表
+const algorithmList: any = ref([]) // 算法列表
+const recognitionList: any = ref([]) // 报警对象列表
 // 获取边缘设备
 const fetchEdgeDeviceList = () => {
   const params = {
-    equipmentName: '', // 设备名称
-    status: '', // 在线状态
-    offset: 1,
-    limit: 999999,
+    boxName: '', // 设备名称
+    code: '', // 在线状态
+    deviceStatus: '', // 在线状态
   }
-  edgeDeviceList.value = [{
-    id: '1',
-    equipmentName: '测试数据1', // 设备名称
-    equipmentNo: '测试数据1', // 设备编号
-    area: '测试数据1', // 所属区域
-    deptName: '203', // 所属单位
-    ip: '1.0.0.0', // ip地址
-    status: '在线', // 在线状态
-  },
-  {
-    id: '2',
-    equipmentName: '测试数据2', // 设备名称
-    equipmentNo: '测试数据2', // 设备编号
-    area: '测试数据2', // 所属区域
-    deptName: '706', // 所属单位
-    ip: '1.0.0.1', // ip地址
-    status: '离线', // 在线状态
-  },
-  ]
+  getBoxList(params).then((res: any) => {
+    edgeDeviceList.value = res.data
+  })
+  console.log('获取边缘设备', edgeDeviceList.value)
 }
 
 // 获取业务场景列表
 const fetchSceneList = () => {
-  sceneList.value = [{
-    id: '1',
-    cjId: '测试数据场景id1',
-    name: '测试数据场景名称1',
-    version: 'V1.0',
-    desc: '测试数据场景描述',
-    status: '未使用',
-  },
-  {
-    id: '2',
-    cjId: '测试数据场景id2',
-    name: '测试数据场景名称2',
-    version: 'V2.0',
-    desc: '测试数据场景描述测试数据场景描述测试数据场景描述测试数据场景描述测试数据场景描述测试数据场景描述测试数据场景描述测试数据场景描述',
-    status: '使用中',
-  },
-  ]
+  const params = {
+    handleTask: '', // 任务标识
+    sceneCode: '', // 场景编码
+    sceneName: '', // 名称
+  }
+  getSceneList(params).then((res: any) => {
+    sceneList.value = res.data
+  })
 }
 
 // 获取算法列表
 const fetchAlgorithmList = () => {
-  algorithmList.value = [{
-    id: '1',
-    sfId: '测试数据算法id1',
-    name: '测试数据算法名称1',
-    version: 'V1.0',
-    desc: '测试数据算法描述',
-    status: '未使用',
-  },
-  {
-    id: '2',
-    sfId: '测试数据算法id2',
-    name: '测试数据算法名称2',
-    version: 'V2.0',
-    desc: '测试数据算法描述',
-    status: '使用中',
-  },
-  ]
+  const params = {
+    code: '', // 模型ID
+    modelName: '', // 名称
+  }
+  getModelList(params).then((res: any) => {
+    algorithmList.value = res.data
+  })
 }
 
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
+  if (`${formData.value.type}` === '0') { // 算法关联
+    if (!selectModelList.value.length) {
+      ElMessage.warning('请选择报警对象')
+      return false
+    }
+    if (!useCheckList(selectModelList.value, columns.value, '报警对象')) {
+      return false
+    }
+  }
   if (formDataRef.value) {
     formDataRef.value?.validate((valid: boolean) => {
       if (valid) {
-        ElMessage.info('敬请期待')
+        selectModelList.value.forEach((item: any) => {
+          const index = recognitionList.value.findIndex((i: { id: string }) => i.id === item.id)
+          if (index !== -1) {
+            recognitionList.value.splice(index, 1, { ...item, isUse: '1' })
+          }
+          else {
+            recognitionList.value.splice(index, 1, { ...item, isUse: '0' })
+          }
+        })
+        const params = {
+          ...formData.value,
+          sceneRelation: formData.value.type === 1 ? { id: formData.value.id, sceneId: formData.value.sceneId } : null,
+          // eslint-disable-next-line multiline-ternary
+          deviceModelRelations: formData.value.type === 0 ? recognitionList.value.map((item: any) => {
+            return {
+              ...item,
+              algoModelId: formData.value.algoModelId, // 算法模型id
+              confidenceLevel:	item.confidenceLevel, // 置信度
+              isUse: item.isUse,
+              recognitionTypeId:	item.recognitionTypeId, // 模型识别类型
+              threshold: item.threshold,	 // 阈值
+            }
+          }) : [],
+        }
+        console.log('要传的参数', params)
+        updateMonitorPoint(params).then(() => {
+          ElMessage.success('设置成功')
+          closeRefresh()
+        })
       }
     })
   }
@@ -148,26 +153,74 @@
 function resetForm() {
   formData.value = {
     id: '',
-    edgeDevice: '', // 关联边缘设备
-    imageSaveInterval: 60, // 识别间隔
+    boxId: '', // 关联边缘设备id
+    deviceId: '', // 设备id
+    recognitionInterval: 60, // 识别间隔
     alarmInterval: 60, // 告警间隔
-    mode: '', // 场景模式
-    relationSceneName: '', // 业务场景
-    relationModelNames: '', // 报警对象/算法关联
+    type: 1, // 场景模式
+
+    sceneId: '', // 业务场景id
+    algoModelId: '', // 模型id
+
+    recognitionUrl: '', // 识别流地址
+    rtspUrl: '', // rtsp地址
+    boundary: '', // 识别边界
   }
+  edgeDeviceList.value = [] // 边缘设备列表
+  sceneList.value = [] // 业务场景列表
+  algorithmList.value = [] // 算法列表
+  recognitionList.value = [] // 报警对象列表
 }
 
-// 选择的算法
-const selectModelList = ref<any[]>([])
 const selectModel = (value: any) => {
   selectModelList.value = value
-  formData.value.relationModelNames = value.map((item: any) => item.name).join(',')
 }
 
 // -----------------------------------初始化、关闭对话框相关-----------------------------------------
-function initDialog(dialogstatus: string, row: IList) {
-  dialogStatus.value = dialogstatus // 类型 新建add 编辑edit 详情detail
+function initDialog(dialogstatus: string, row: any) {
   dialogVisible.value = true
+  fetchEdgeDeviceList() // 获取边缘设备列表
+  fetchAlgorithmList() // 获取算法列表
+  fetchSceneList() // 业务场景列表
+  if (dialogstatus === 'edit' || dialogstatus === 'detail') {
+    formData.value.boxId = row.boxId // 边缘设备id
+    formData.value.recognitionInterval = row.recognitionInterval || 60 // 识别间隔
+    formData.value.alarmInterval = row.alarmInterval || 60 // 告警间隔
+    formData.value.type = row.type // 场景模式
+    formData.value.id = row.id // id
+    formData.value.deviceId = row.deviceId // 设备id
+    formData.value.recognitionUrl = row.recognitionUrl || 'http://192.168.83.42/recognitionUrl'// 识别流地址
+    formData.value.rtspUrl = row.rtspUrl || 'http://192.168.83.42/rtsp' // rtsp地址
+    // formData.value.boundary = formData.value.boundary ? JSON.parse(formData.value.boundary) : formData.value.boundary // 识别边界
+    if (`${row.type}` === '0') { // 算法关联
+      formData.value.algoModelId = row.deviceModelRelations && row.deviceModelRelations.length && row.deviceModelRelations[0].algoModelId // 模型id
+      recognitionList.value = row.deviceModelRelations.map((item: any) => {
+        return {
+          ...item,
+          confidenceLevel: `${item.confidenceLevel}` ? Number(item.confidenceLevel) : undefined,
+          threshold: `${item.threshold}` ? Number(item.threshold) : undefined,
+        }
+      })
+
+      // 恢复选中状态
+      const selectedRows = recognitionList.value.filter((item: any) => `${item.isUse}` === '1')
+      if (selectedRows && Array.isArray(selectedRows) && selectedRows.length) {
+        nextTick(() => {
+          selectedRows.forEach((row: any) => {
+            algorithmTableRef.value?.toggleRowSelection(row, true)
+          })
+        })
+      }
+    }
+    else if (`${row.type}` === '1') { // 业务场景
+      formData.value.sceneId = row.sceneRelation.sceneId
+    }
+  }
+
+  if (dialogstatus === 'detail') {
+    formDataRef.value?.clearValidate()
+  }
+  dialogStatus.value = dialogstatus // 类型 新建add 编辑edit 详情detail
   btnLoading.value = false
 }
 
@@ -177,57 +230,73 @@
   resetForm()
   emits('closeRefresh')
 }
-// 关闭弹窗
-function dialogClose() {
-  dialogVisible.value = false
-  resetForm()
-  closeRefresh()
+
+// 监听算法变化，查询算法报警对象
+const changeAlgoModelId = (newValue: string) => {
+  if (newValue) {
+    // 获取场景对象
+    const params = {
+      modelId: newValue, // 模型ID
+      typeCode: '', // 类型编码
+      typeName: '', // 类型名称
+    }
+    getRecognitionList(params).then((res) => {
+      recognitionList.value = res.data.map((item: { id: string; typeName: string }) => {
+        return {
+          ...item,
+          recognitionTypeName: item.typeName,
+          recognitionTypeId: item.id,
+          id: '',
+        }
+      })
+    })
+  }
 }
 
-onMounted(() => {
-  fetchEdgeDeviceList() // 获取边缘设备列表
-  fetchSceneList() // 业务场景列表
-  fetchAlgorithmList() // 获取算法列表
-})
+const givePoints = (value: any) => {
+  formData.value.boundary = JSON.stringify(value)
+}
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
 </script>
 
 <template>
   <el-dialog
-    v-model="dialogVisible" :title="textMap[dialogStatus]" width="1200" :before-close="dialogClose" append-to-body
+    v-model="dialogVisible" :title="textMap[dialogStatus]" width="800" :before-close="closeRefresh" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
     <el-row :gutter="30">
-      <el-col :span="15">
+      <el-col :span="24">
         <el-form
           ref="formDataRef" :model="formData" :rules="rules" label-position="right" label-width="130px"
-          class="form-container" size="default" @submit.prevent
+          class="form-container" size="default" :disabled="dialogStatus === 'detail'" @submit.prevent
         >
           <el-row :gutter="10">
             <el-col :span="24" class="grid-cell">
-              <el-form-item label="关联边缘设备" prop="equipmentName" class="required">
+              <el-form-item label="关联边缘设备" prop="boxId" class="required">
                 <el-select
-                  v-model="formData.edgeDevice"
+                  v-model="formData.boxId"
                   placeholder="关联边缘设备"
                   clearable
                   filterable
+                  :disabled="dialogStatus === 'detail'"
                 >
-                  <el-option v-for="item of edgeDeviceList" :key="item.id" :label="item.equipmentName" :value="item.id" >
+                  <el-option v-for="item of edgeDeviceList" :key="item.id" :label="item.boxName" :value="item.id">
                     <div style="display: flex;justify-content: space-between;">
-                      <span style="font-weight: 600;">{{ item.equipmentName }}</span>
-                      <span style="color: #8492a6; font-size: 13px">{{ item.area }}</span>
-                      <span style="color: #8492a6; font-size: 13px">{{ item.deptName }}</span>
+                      <span style="font-weight: 600;">{{ item.boxName }}</span>
+                      <span style="color: #8492a6; font-size: 13px" :style="{ color: `${item.deviceStatus}` === '0' ? '#0e932e' : '#979797' }">{{ `${item.deviceStatus}` === '0' ? '在线' : '离线' }}</span>
+                      <span style="color: #8492a6; font-size: 13px">{{ item.ip }}</span>
                     </div>
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="14">
-              <el-form-item label="识别间隔(s)" prop="imageSaveInterval">
+              <el-form-item label="识别间隔(s)" prop="recognitionInterval">
                 <el-input-number
-                  v-model="formData.imageSaveInterval" class="full-width-input"
+                  v-model="formData.recognitionInterval" class="full-width-input"
                   :min="1" :precision="0" :step="1" placeholder="必填"
+                  :disabled="dialogStatus === 'detail'"
                 />
               </el-form-item>
             </el-col>
@@ -236,34 +305,53 @@
                 <el-input-number
                   v-model="formData.alarmInterval" class="full-width-input"
                   :min="1" :precision="0" :step="1" placeholder="必填"
+                  :disabled="dialogStatus === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="14">
+              <el-form-item label="rtsp地址" prop="rtspUrl">
+                <el-input
+                  v-model="formData.rtspUrl" class="full-width-input"
+                  placeholder="必填"
+                  :disabled="dialogStatus === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="14">
+              <el-form-item label="识别流地址 " prop="recognitionUrl">
+                <el-input
+                  v-model="formData.recognitionUrl" class="full-width-input"
+                  placeholder="必填"
+                  :disabled="dialogStatus === 'detail'"
                 />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="24">
-              <el-form-item label="场景模式" prop="mode">
-                <el-radio-group v-model="formData.mode">
-                  <el-radio label="2">
+              <el-form-item label="场景模式" prop="type">
+                <el-radio-group v-model="formData.type" :disabled="dialogStatus === 'detail'">
+                  <el-radio :label="1">
                     业务场景
                   </el-radio>
-                  <el-radio label="1">
+                  <el-radio :label="0">
                     算法关联
                   </el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="formData.mode === '2'" :gutter="24">
+          <el-row v-if="formData.type === 1" :gutter="24">
             <el-col :span="24">
-              <el-form-item label="业务场景" prop="relationSceneName">
+              <el-form-item label="业务场景" prop="sceneId">
                 <el-select
-                  v-model="formData.relationSceneName" placeholder="业务场景" clearable class="select"
-                  style="width: 100%;"
+                  v-model="formData.sceneId" placeholder="业务场景" clearable class="select"
+                  style="width: 100%;" :disabled="dialogStatus === 'detail'"
                 >
-                  <el-option v-for="item in sceneList" :key="item.id" :value="item.name" :label="item.name">
+                  <el-option v-for="item in sceneList" :key="item.id" :value="item.id" :label="item.sceneName">
                     <div style="display: flex;justify-content: space-between;">
-                      <span style="font-weight: 600;">{{ item.name }}</span>
+                      <span style="font-weight: 600;">{{ item.sceneName }}</span>
                       <span style="color: #8492a6; font-size: 13px">{{ item.version }}</span>
                     </div>
                   </el-option>
@@ -271,54 +359,74 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="formData.mode === '1'" :gutter="24">
+          <el-row v-if="formData.type === 0" :gutter="24">
             <el-col :span="24">
-              <el-form-item label="算法关联" prop="relationModelNames">
+              <el-form-item label="算法名称" prop="algoModelId">
+                <el-select
+                  v-model="formData.algoModelId" placeholder="请选择算法" clearable class="select"
+                  style="width: 100%;" :disabled="dialogStatus === 'detail'"
+                  @change="changeAlgoModelId"
+                >
+                  <el-option v-for="item in algorithmList" :key="item.id" :value="item.id" :label="item.modelName">
+                    <div style="display: flex;justify-content: space-between;">
+                      <span style="font-weight: 600;">{{ item.modelName }}</span>
+                      <span style="color: #8492a6; font-size: 13px">{{ item.version }}</span>
+                    </div>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="formData.type === 0" :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="报警对象">
                 <el-table
-                  ref="multipleTableRef" :data="algorithmList" border stripe style="width: 100%;"
+                  ref="algorithmTableRef" :data="recognitionList" border stripe style="width: 100%;"
                   max-height="400px" @selection-change="selectModel"
                 >
-                  <el-table-column label="算法名称" align="center" value="name">
-                    <template #default="scope">
-                      {{ scope.row.name }}
+                  <el-table-column
+                    v-for="item in columns"
+                    :key="item.value"
+                    :prop="item.value"
+                    :label="item.text"
+                    align="center"
+                  >
+                    <template #header>
+                      <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
                     </template>
-                  </el-table-column>
-                  <el-table-column label="置信度" align="center">
                     <template #default="scope">
                       <el-input-number
-                        v-model="scope.row.customThreshold"
-                        :min="1"
-                        :precision="0.01"
+                        v-if="dialogStatus !== 'detail' && (item.value === 'confidenceLevel' || item.value === 'threshold')"
+                        v-model="scope.row[item.value]"
+                        :min="0"
+                        :precision="2"
                         controls-position="right"
                       />
+                      <!-- <el-input-number v-if="item.value === 'threshold'" v-model="scope.row[item.value]" controls-position="right" :min="0" /> -->
+                      <span v-else>{{ scope.row[item.value] }}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column label="阈值" align="center">
-                    <template #default="scope">
-                      <el-input-number v-model="scope.row.customThreshold" controls-position="right" :min="0" />
-                    </template>
-                  </el-table-column>
-                  <el-table-column type="selection" width="55" align="center" />
+                  <el-table-column :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
                 </el-table>
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
       </el-col>
-      <el-col :span="8">
+      <!-- <el-col :span="8">
         <span style="display: block;font-weight: 600; margin-bottom: 6px;font-size: 14px;">区域绘制</span>
         <div id="draw-area" class="draw">
-          <draw-area />
-          <span style="margin-top: 10px;font-size: 11px;color: red;">注意：请绘制出一个四边形</span>
+          <draw-area :dialog-status="dialogStatus" @givePoints="givePoints"/>
+          <span v-if="dialogStatus !== 'detail'" style="margin-top: 10px;font-size: 11px;color: red;">注意：请绘制出一个四边形</span>
         </div>
-      </el-col>
+      </el-col> -->
     </el-row>
     <template #footer>
-      <div v-show="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button :loading="btnLoading" type="primary" @click="submitForm">
+      <div class="dialog-footer">
+        <el-button v-if="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
-        <el-button @click="dialogClose">
+        <el-button @click="closeRefresh">
           取消
         </el-button>
       </div>
diff --git a/src/views/alarm/policyConfig/monitorPoint/list.vue b/src/views/alarm/policyConfig/monitorPoint/list.vue
index 5c93a17..eb94812 100644
--- a/src/views/alarm/policyConfig/monitorPoint/list.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/list.vue
@@ -6,6 +6,7 @@
 import type { IList, IListQuery } from './monitorPoint-interface'
 import EditDialog from './editDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getMonitorPointList } from '@/api/alarm/policyConfig/monitorPoint'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
@@ -16,34 +17,33 @@
 const loading = ref(false)
 // 默认查询条件
 const listQuery: Ref<IListQuery> = ref({
-  equipmentName: '', // 设备名称
-  status: '', // 在线状态
+  deviceName: '', // 设备名称
+  deviceStatus: '', // 在线状态
   offset: 1,
   limit: 20,
 })
 // 表格表头
 const columns: Ref<TableColumn[]> = ref([
-  { text: '摄像头名称', value: 'equipmentName', align: 'center' },
-  { text: '摄像头编号', value: 'equipmentNo', align: 'center' },
+  { text: '摄像头名称', value: 'deviceName', align: 'center' },
+  { text: '摄像头编号', value: 'deviceNo', align: 'center' },
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '关联边缘设备', value: 'edgeDevice', align: 'center' },
-  { text: 'RTSP地址', value: 'rtsp', align: 'center' },
-  { text: '识别间隔(s)', value: 'imageSaveInterval', align: 'center' },
+  { text: '关联边缘设备', value: 'boxName', align: 'center' },
+  { text: 'RTSP地址', value: 'rtspUrl', align: 'center' },
+  { text: '识别间隔(s)', value: 'recognitionInterval', align: 'center' },
   { text: '告警间隔(s)', value: 'alarmInterval', align: 'center' },
-  { text: '业务场景', value: 'relationSceneName', align: 'center' },
-  { text: '报警对象', value: 'relationModelNames', align: 'center' },
-  // { text: '在线状态', value: 'status', align: 'center' },
+  { text: '业务场景', value: 'typeName', align: 'center' },
+  { text: '报警对象', value: 'recognitionTypeName', align: 'center' },
 ])
 const total = ref(0) // 数据条数
 const list = ref<IList[]>([]) // 数据条数
 const checkoutList = ref<IList[]>([]) // 数据条数
 
 // ------------------------------------字典------------------------------------------
-const statusList = ref<dictType[]>([]) // 在线状态
+const deviceStatusList = ref<dictType[]>([]) // 在线状态
 const getDict = () => {
   // 在线状态
   getDictByCode('status').then((response) => {
-    statusList.value = response.data
+    deviceStatusList.value = response.data
   })
 }
 getDict()
@@ -52,52 +52,26 @@
 // 查询数据
 const fetchData = () => {
   loading.value = true
-  // getDevListPage(listQuery).then((res: { data: { rows: []; total: number } }) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loading.value = false
-  // })
-  list.value = [{
-    id: '1',
-    equipmentName: '测试数据1', // 设备名称
-    equipmentNo: '测试数据1', // 设备编号
-    // area: '测试数据1', // 所属区域
-    deptName: '测试数据1', // 所属单位
-    edgeDevice: '测试数据1', // 关联边缘设备
-    rtsp: '测试数据1', // RTSP地址
-    imageSaveInterval: 20, // 识别间隔
-    alarmInterval: 20, // 告警间隔
-    relationSceneName: '测试数据1', // 业务场景
-    relationModelNames: '测试数据1', // 报警对象
-    mode: '1',
-    status: '在线', // 在线状态
-    deptId: '测试数据1', // 所属单位id
-  },
-  {
-    id: '2',
-    equipmentName: '测试数据2', // 设备名称
-    equipmentNo: '测试数据2', // 设备编号
-    // area: '测试数据2', // 所属区域
-    deptName: '测试数据2', // 所属单位
-    edgeDevice: '测试数据2', // 关联边缘设备
-    rtsp: '测试数据2', // RTSP地址
-    imageSaveInterval: 20, // 识别间隔
-    alarmInterval: 20, // 告警间隔
-    mode: '2',
-    relationSceneName: '测试数据2', // 业务场景
-    relationModelNames: '测试数据2', // 报警对象
-    status: '离线', // 在线状态
-    deptId: '测试数据2', // 所属单位id
-  },
-  ]
+  getMonitorPointList(listQuery.value).then((res: { data: { rows: []; total: number } }) => {
+    list.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        typeName: `${item.type}` === '1' ? item.sceneRelation.sceneName : '/', // 业务场景
+        recognitionTypeName: `${item.type}` === '0' ? item.deviceModelRelations.map((i: { recognitionTypeName: any }) => i.recognitionTypeName).join(',') : '/', // 报警对象
+      }
+    })
+    total.value = res.data.total
+    loading.value = false
+  })
+
   loading.value = false
 }
 
 // 搜索重置
 const reset = () => {
   listQuery.value = {
-    equipmentName: '', // 设备名称
-    status: '', // 在线状态
+    deviceName: '', // 设备名称
+    deviceStatus: '', // 在线状态
     offset: 1,
     limit: 20,
   }
@@ -120,7 +94,7 @@
 // 删除
 const del = (row: IList) => {
   ElMessageBox.confirm(
-    `确定要删除${row.equipmentName}吗？`,
+    `确定要删除${row.deviceName}吗？`,
     '确认删除',
     {
       confirmButtonText: '确定',
@@ -156,31 +130,38 @@
   <app-container>
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.equipmentName" placeholder="设备名称" clearable style="width: 200px;" @change="search" />
+        <el-input v-model="listQuery.deviceName" placeholder="摄像头名称" clearable style="width: 200px;" @change="search" />
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.status"
+          v-model="listQuery.deviceStatus"
           placeholder="在线状态"
           style="width: 220px;"
           clearable
           @change="search"
         >
-          <el-option v-for="item of statusList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-option v-for="item of deviceStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <normal-table :query="listQuery" :list-loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="在线状态" align="center" width="120">
             <template #default="scope">
-              <el-tag :type="scope.row.status === '在线' ? 'success' : 'danger'">
-                {{ scope.row.status }}
+              <el-tag v-if="scope.row.deviceStatusName" :type="scope.row.deviceStatusName === '在线' ? 'success' : 'danger'">
+                {{ scope.row.deviceStatusName }}
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="120" align="center">
+          <el-table-column label="操作" width="120" align="center" fixed="right">
             <template #default="scope">
               <el-button type="primary" link size="small" class="table-text-button" @click="detail(scope.row)">
                 详情
diff --git a/src/views/alarm/policyConfig/monitorPoint/monitorPoint-interface.ts b/src/views/alarm/policyConfig/monitorPoint/monitorPoint-interface.ts
index f8d031a..144dc5c 100644
--- a/src/views/alarm/policyConfig/monitorPoint/monitorPoint-interface.ts
+++ b/src/views/alarm/policyConfig/monitorPoint/monitorPoint-interface.ts
@@ -1,33 +1,44 @@
 export interface IListQuery {
-  equipmentName: string // 设备名称
-  status: string // 在线状态
+  deviceName: string // 设备名称
+  deviceStatus: string // 在线状态
   offset: number
   limit: number
 }
 
 export interface IList {
   id: string // 主键
-  equipmentName: string // 设备名称
+  deviceName: string // 设备名称
   equipmentNo: string // 设备编号
   // area: string // 所属区域
   deptName: string // 所属单位
   edgeDevice: string // 关联边缘设备
   rtsp: string // RTSP地址
   imageSaveInterval: number // 识别间隔
-  alarmInterval: number // 告警间隔
   relationSceneName: string // 业务场景
   mode: string // 场景模式
   relationModelNames: string // 报警对象
-  status: string // 在线状态
+  deviceStatus: string // 在线状态
   deptId?: string // 所属单位id
+
+  boxId: string // 边缘设备id
+  deviceId: string // 设备id
+  recognitionInterval: number // 识别间隔
+  alarmInterval: number // 告警间隔
+  type: number // 场景模式
 }
 
 export interface IForm {
-  id: string // 数据id
-  edgeDevice: string // 关联边缘设备
-  imageSaveInterval: number // 识别间隔
+  id: string
+  boxId: string // 关联边缘设备id
+  deviceId: string // 设备id
+  recognitionInterval: number // 识别间隔
   alarmInterval: number // 告警间隔
-  mode: string // 场景模式
-  relationSceneName: string // 业务场景
-  relationModelNames: string // 报警对象/算法关联
+  type: number // 场景模式
+
+  sceneId: string // 业务场景id
+  algoModelId: string // 模型id
+
+  recognitionUrl: string // 识别流地址
+  rtspUrl: string // rtsp地址
+  boundary: string // 识别边界
 }
diff --git a/src/views/monitor/deviceManage/editDev.vue b/src/views/monitor/deviceManage/editDev.vue
index a054f59..0ad0669 100644
--- a/src/views/monitor/deviceManage/editDev.vue
+++ b/src/views/monitor/deviceManage/editDev.vue
@@ -360,8 +360,8 @@
             <el-input :value="formData.areaName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必选" @click="openAreaSelect" />
           </el-form-item>
         </el-col>
-        <el-col :span="12" class="grid-cell">
-          <el-form-item label="所属单位" prop="deptId" class="required">
+        <el-col :span="12">
+          <el-form-item label="所属单位" prop="deptId">
             <dept-select v-model="formData.deptId" :disabled="dialogStatus === 'detail'" :dept-show="true" />
           </el-form-item>
         </el-col>

diff --git a/public/config/config.json b/public/config/config.json
index a85fc42..29161c3 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -10,5 +10,5 @@
   "maxZoom": "13",
   "zoom": "10",
   "timeGap": 3000,
-  "systemType": "sm"
+  "systemType": "gm"
 }
diff --git a/src/api/alarm/dangerAssessment/manage.ts b/src/api/alarm/dangerAssessment/manage.ts
new file mode 100644
index 0000000..dae1056
--- /dev/null
+++ b/src/api/alarm/dangerAssessment/manage.ts
@@ -0,0 +1,50 @@
+/**
+ * 安全生产隐患管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getDangerAssessmentManageList(data: any) {
+  return request({
+    url: 'risk/listPage',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 详情
+export function getDangerAssessmentManageDetail(data: { id: string }) {
+  return request({
+    url: 'risk/detail',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 新增
+export function addDangerAssessmentManage(data: object) {
+  return request({
+    url: 'risk/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateDangerAssessmentManage(data: object) {
+  return request({
+    url: 'risk/update',
+    method: 'post',
+    data,
+  })
+}
+
+// 批量导入
+export function batchImport(data: object) {
+  return request({
+    url: 'risk/batchImport',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/alarm/policyConfig/monitorPoint.ts b/src/api/alarm/policyConfig/monitorPoint.ts
new file mode 100644
index 0000000..e4cd648
--- /dev/null
+++ b/src/api/alarm/policyConfig/monitorPoint.ts
@@ -0,0 +1,68 @@
+/**
+ * 监控点位管理
+ */
+import request from '../../index'
+
+// 获取列表
+export function getMonitorPointList(data: any) {
+  return request({
+    url: 'device/relation/listPage',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 详情
+export function getMonitorPointDetail(data: { id: string }) {
+  return request({
+    url: 'device/relation/detail',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 编辑
+export function updateMonitorPoint(data: object) {
+  return request({
+    url: 'device/relation/update',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取盒子列表
+export function getBoxList(data: any) {
+  return request({
+    url: 'device/box/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 获取算法列表
+export function getModelList(data: any) {
+  return request({
+    url: 'device/model/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 获取算法-场景对象列表
+export function getSceneList(data: any) {
+  return request({
+    url: 'scene/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 算法报警对象
+export function getRecognitionList(data: any) {
+  return request({
+    url: 'device/recognitionType/recognitionList',
+    method: 'get',
+    params: data,
+  })
+}
+
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 04b39cc..92165e1 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -40,7 +40,7 @@
     default: 'default',
   }, // 输入框大小
 })
-const emit = defineEmits(['update:modelValue'])
+const emit = defineEmits(['update:modelValue', 'changeDept'])
 // ------------定义props参数----------
 const value = computed({
   get() {
@@ -153,6 +153,10 @@
     return []
   }
 }
+
+const changeDept = (val: any) => {
+  emit('changeDept', val)
+}
 // --------暴露方法
 defineExpose({ refreshTree, fetchDeptTree, findChildren })
 </script>
@@ -176,6 +180,7 @@
       filterable
       class="full-width-input"
       :disabled="props.disabled"
+      @change="changeDept"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index d1f5b24..e3d6460 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -8,5 +8,6 @@
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
   fixed?: boolean // 固定列
+  required?: boolean // 是否必填
 }
 
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
index 31a16b9..fb5f8ac 100644
--- a/src/utils/useCheckList.ts
+++ b/src/utils/useCheckList.ts
@@ -1,5 +1,4 @@
 import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 
 /**
  * 检查列表
@@ -7,13 +6,14 @@
  * @param columns // 表头信息
  * @param tableTitle // 表格名称
  */
-export function useCheckList(list: { [key: string]: string }[], columns: TableColumn, tableTitle = '') {
+export function useCheckList(list: { [key: string]: string }[], columns: any, tableTitle = '') {
   for (let index = 0; index < list.length; index++) {
     const item = list[index]
     for (const prop of columns) {
       // 检查必填
       if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        // ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        ElMessage.warning(`请先完善${tableTitle}中【${item.typeName}】的${prop.text}`)
         return false
       }
       // 验证正则
diff --git a/src/views/alarm/dangerAssessment/manage/editPointDialog.vue b/src/views/alarm/dangerAssessment/manage/editPointDialog.vue
new file mode 100644
index 0000000..db4b29f
--- /dev/null
+++ b/src/views/alarm/dangerAssessment/manage/editPointDialog.vue
@@ -0,0 +1,219 @@
+<!-- 新增、编辑危险点 -->
+<script lang="ts" setup name="EditPointDialog">
+import { reactive, ref } from 'vue'
+import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { addDangerAssessmentManage, updateDangerAssessmentManage } from '@/api/alarm/dangerAssessment/manage'
+const emits = defineEmits(['closeRefresh'])
+const dialogStatus = ref('add')
+const dialogVisible = ref(false) // 弹窗显示隐藏
+// 显示标题
+const textMap: { [key: string]: string } = {
+  detail: '详情',
+  edit: '编辑',
+  add: '新增',
+}
+
+// 表单数据对象
+const formData = ref({
+  id: '',
+  deptId: '', // 所属单位id
+  deptName: '', // 所属单位
+  riskName: '', // 危险点名称
+  address: '', // 详细地址
+  content: '', // 作业活动概述
+  nature: '', // 危险性质
+  grade: '', // 等级
+  assignPost: '', // 定岗
+  staffQuota: 1, // 定员
+  substancesQuantities: '', // 危险物质及定量
+})
+const btnLoading = ref(false) // 保存按钮加载状态
+const formDataRef = ref<FormInstance>() // 表单对象
+// 校验规则
+const rules = reactive<FormRules>({
+  deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
+  riskName: [{ required: true, message: '危险点名称必填', trigger: ['blur', 'change'] }],
+  address: [{ required: true, message: '详细地址必填', trigger: ['blur', 'change'] }],
+  content: [{ required: true, message: '作业活动概述必填', trigger: ['blur', 'change'] }],
+  nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
+  grade: [{ required: true, message: '等级必填', trigger: ['blur', 'change'] }],
+  assignPost: [{ required: true, message: '定岗必填', trigger: ['blur', 'change'] }],
+  staffQuota: [{ required: true, message: '定员必填', trigger: ['blur', 'change'] }],
+  substancesQuantities: [{ required: true, message: '危险物质及定量必填', trigger: ['blur', 'change'] }],
+})
+
+// -----------------------------------------字典--------------------------------------------------------------
+const deviceStatusList = ref<dictType[]>([]) // 危险点等级
+const getDict = async () => {
+  // 危险点等级
+  getDictByCode('dangerPointGrade').then((response) => {
+    deviceStatusList.value = response.data
+  })
+}
+getDict()
+// -------------------------------------------------------------------------------------------
+// 表单提交
+function submitForm() {
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.warning('新增危险点成功')
+            return false
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.warning('编辑危险点成功')
+            return false
+          })
+        }
+      }
+    })
+  }
+}
+
+// 重置表单
+function resetForm() {
+  formData.value = {
+    id: '',
+    deptId: '', // 所属单位id
+    deptName: '', // 所属单位
+    riskName: '', // 危险点名称
+    address: '', // 详细地址
+    content: '', // 作业活动概述
+    nature: '', // 危险性质
+    grade: '', // 等级
+    assignPost: '', // 定岗
+    staffQuota: 1, // 定员
+    substancesQuantities: '', // 危险物质及定量
+  }
+}
+
+// -----------------------------------初始化、关闭对话框相关-----------------------------------------
+function initDialog(dialogstatus: string, row: any) {
+  dialogVisible.value = true
+  if (dialogstatus === 'edit' || dialogstatus === 'detail') {
+    formData.value.id = row.id
+    formData.value.deptId = row.deptId // 所属单位id
+    formData.value.deptName = row.deptName // 所属单位
+    formData.value.riskName = row.riskName // 危险点名称
+    formData.value.address = row.address // 详细地址
+    formData.value.content = row.content // 作业活动概述
+    formData.value.nature = row.nature // 危险性质
+    formData.value.grade = row.grade // 等级
+    formData.value.assignPost = row.assignPost // 定岗
+    formData.value.staffQuota = Number(row.staffQuota) // 定员
+    formData.value.substancesQuantities = row.substancesQuantities // 危险物质及定量
+  }
+
+  // 详情隐藏表单校验
+  if (dialogstatus === 'detail') {
+    formDataRef.value?.clearValidate()
+  }
+  dialogStatus.value = dialogstatus // 类型 新建add 编辑edit 详情detail
+  btnLoading.value = false
+}
+
+// 关闭并刷新
+function closeRefresh() {
+  dialogVisible.value = false
+  resetForm()
+  emits('closeRefresh')
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible" :title="textMap[dialogStatus]" width="800" :before-close="closeRefresh" append-to-body
+    :open-delay="0" :close-on-click-modal="false"
+  >
+    <el-form
+      ref="formDataRef" :model="formData" :rules="rules" label-position="right" label-width="130px"
+      class="form-container" size="default" :disabled="dialogStatus === 'detail'" @submit.prevent
+    >
+      <el-row :gutter="10">
+        <el-col :span="12">
+          <el-form-item label="所属单位" prop="deptId">
+            <dept-select v-model="formData.deptId" placeholder="必选" :disabled="dialogStatus === 'detail'" :dept-show="true" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="危险源名称" prop="riskName">
+            <el-input :value="formData.riskName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="详细地址" prop="address">
+            <el-input :value="formData.address" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="作业活动概述" prop="content">
+            <el-input :value="formData.content" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="危险性质" prop="nature">
+            <el-input :value="formData.nature" :disabled="dialogStatus === 'detail'" type="text" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="等级" prop="grade">
+            <el-select
+              v-model="formData.grade"
+              placeholder="必选"
+              clearable
+              filterable
+              :disabled="dialogStatus === 'detail'"
+            >
+              <el-option v-for="item of deviceStatusList" :key="item.id" :label="item.name" :value="item.name "/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="定岗" prop="assignPost">
+            <el-input :value="formData.assignPost" :disabled="dialogStatus === 'detail'" type="text" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="定员" prop="staffQuota">
+            <el-input-number
+              v-model="formData.staffQuota" class="full-width-input"
+              :min="1" :precision="0" :step="1" placeholder="必填"
+              :disabled="dialogStatus === 'detail'"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="危险物质及定量" prop="substancesQuantities">
+            <el-input :value="formData.substancesQuantities" :disabled="dialogStatus === 'detail'" type="text" autosize placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button v-if="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button @click="closeRefresh">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//
+</style>
diff --git a/src/views/alarm/dangerAssessment/manage/list.vue b/src/views/alarm/dangerAssessment/manage/list.vue
index a1b6214..3e27450 100644
--- a/src/views/alarm/dangerAssessment/manage/list.vue
+++ b/src/views/alarm/dangerAssessment/manage/list.vue
@@ -5,61 +5,112 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IList, IListQuery } from './manage-interface'
 // import EditDialog from './editDialog.vue'
+import editPointDialog from './editPointDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { uploadApi } from '@/api/monitor/dev'
 import { getDictByCode } from '@/api/system/dict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { dictType } from '@/global'
+import { getDangerAssessmentManageList } from '@/api/alarm/dangerAssessment/manage'
 const { proxy } = getCurrentInstance() as any
 const editDialogRef = ref() // 组件
 const router = useRouter()
 // 文件上传input
 const fileRef = ref()
 const loading = ref(false)
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('') // 右上方按钮
+// ------------------------------------------------------------------------------------------
 // 默认查询条件
 const listQuery: Ref<IListQuery> = ref({
   area: '', // 所属区域
-  deptId: '', // 所属区域
-  dangerCategory: '', // 隐患分类
-  startTime: '', // 开始时间
-  endTime: '', // 结束时间
+  deptId: '', // 所属组织
+  riskName: '', // 危险点名称
+  riskType: '', // 危险点类型
   offset: 1,
   limit: 20,
 })
-// 表格表头
-const columns: Ref<TableColumn[]> = ref([
-  { text: '所属区域', value: 'area', align: 'center' },
+// ------------------------------------------表头---------------------------------------------
+const columns: Ref<TableColumn[]> = ref([]) // 表头
+// 危险点
+const columnsPoint: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '业务内容', value: 'businessContent', align: 'center' },
-  { text: '隐患分类Ⅰ', value: 'yhfl1', align: 'center' },
-  { text: '隐患分类Ⅱ', value: 'yhfl2', align: 'center' },
-  { text: '监控相机', value: 'equipmentName', align: 'center' },
-  { text: '录入时间', value: 'time', align: 'center' },
-  { text: '备注', value: 'remark', align: 'center' },
-])
+  { text: '危险点名称', value: 'riskName', align: 'center' },
+  { text: '详细地址', value: 'address', align: 'center' },
+  { text: '作业活动概述', value: 'content', align: 'center' },
+  { text: '危险性质', value: 'nature', align: 'center' },
+  { text: '等级', value: 'grade', align: 'center' },
+  { text: '定岗', value: 'assignPost', align: 'center' },
+  { text: '定员', value: 'staffQuota', align: 'center' },
+  { text: '危险物质及定量', value: 'substancesQuantities', align: 'center' },
+]
+// 重大危险源
+const columnsSource: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险源名称', value: 'businessContent', align: 'center' },
+  { text: '场所级别', value: 'yhfl1', align: 'center' },
+  { text: '危险化学品名称', value: 'yhfl2', align: 'center' },
+  { text: '危险性质', value: 'equipmentName', align: 'center' },
+  { text: '存量', value: 'time', align: 'center' },
+  { text: '临界量', value: 'remark', align: 'center' },
+  { text: '分级指数', value: 'remark', align: 'center' },
+  { text: '危险物质及定量', value: 'remark', align: 'center' },
+  { text: '危险源等级', value: 'remark', align: 'center' },
+]
+// 危险化学品场所
+const columnsChemistry: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险化学品场所', value: 'businessContent', align: 'center' },
+  { text: '场所分类', value: 'yhfl1', align: 'center' },
+  { text: '作业活动', value: 'yhfl2', align: 'center' },
+  { text: '危化品名称', value: 'equipmentName', align: 'center' },
+  { text: '危险性质', value: 'time', align: 'center' },
+  { text: '定岗', value: 'remark', align: 'center' },
+  { text: '定员', value: 'remark', align: 'center' },
+  { text: '定量', value: 'remark', align: 'center' },
+  { text: '定寿命', value: 'remark', align: 'center' },
+  { text: '定检', value: 'remark', align: 'center' },
+]
+// 危险作业
+const columnsWork: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险作业', value: 'businessContent', align: 'center' },
+  { text: '危险作业等级', value: 'yhfl1', align: 'center' },
+  { text: '主要危险描述', value: 'yhfl2', align: 'center' },
+  { text: '相关部门', value: 'equipmentName', align: 'center' },
+  { text: '作业频次', value: 'time', align: 'center' },
+]
+// 危险作业工序
+const columnsWorkProcesses: TableColumn[] = [
+  { text: '所属单位', value: 'deptName', align: 'center' },
+  { text: '危险作业工序', value: 'businessContent', align: 'center' },
+  { text: '作业人员数量', value: 'yhfl1', align: 'center' },
+  { text: '事故类型', value: 'yhfl2', align: 'center' },
+]
+// -------------------------------------------------------------------------------------------
 const total = ref(0) // 数据条数
-const list = ref<IList[]>([]) // 数据条数
-const checkoutList = ref<IList[]>([]) // 数据条数
-// 开始结束时间
-const datetimerange = ref()
-watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
-  if (Array.isArray(newVal)) {
-    if (newVal.length) {
-      listQuery.value.startTime = `${newVal[0]} 00:00:00`
-      listQuery.value.endTime = `${newVal[1]} 23:59:59`
+const list = ref([]) // 数据条数
+const checkoutList = ref([]) // 数据条数
+
+const editPointDialogRef = ref() // 危险点ref
+// -----------------------------------------字典--------------------------------------------------------------
+// 查询字典
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('dangerAssessmentType')
+  // 制作右上角的菜单
+  const tempMenu = ['重大危险源', '危险点', '危险化学品场所', '危险作业', '危险作业工序']
+  tempMenu.forEach((item) => {
+    const tempFindData = res.data.find((e: { name: string; value: string }) => e.name === item)
+    if (tempFindData) {
+      menu.value.push({
+        name: tempFindData.name,
+        id: `${tempFindData.value}`,
+      })
     }
-  }
-})
-// ------------------------------------字典------------------------------------------
-// const statusList = ref<dictType[]>([]) // 在线状态
-const getDict = () => {
-  // // 在线状态
-  // getDictByCode('status').then((response) => {
-  //   statusList.value = response.data
-  // })
+  })
 }
-getDict()
 // -----------------------------------文件上传-------------------------------------------
 // 点击批量导入
 const batchImport = () => {
@@ -101,34 +152,12 @@
 // 查询数据
 const fetchData = () => {
   loading.value = true
-  // getDevListPage(listQuery).then((res: { data: { rows: []; total: number } }) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loading.value = false
-  // })
-  list.value = [{
-    id: '1',
-    area: '测试数据1', // 设备名称
-    deptName: '测试数据1', // 设备编号
-    businessContent: '测试数据1', // 所属单位
-    yhfl1: '测试数据1', // RTSP地址
-    yhfl2: '测试数据1', // 识别间隔
-    equipmentName: '测试数据1', // 告警间隔
-    time: '2021-11-11',
-    remark: '测试数据1', // 业务场景
-  },
-  {
-    id: '2',
-    area: '测试数据2', // 设备名称
-    deptName: '测试数据2', // 设备编号
-    businessContent: '测试数据2', // 所属单位
-    yhfl1: '测试数据2', // RTSP地址
-    yhfl2: '测试数据2', // 识别间隔
-    equipmentName: '测试数据2', // 告警间隔
-    time: '2022-09-08',
-    remark: '测试数据2', // 业务场景
-  },
-  ]
+  listQuery.value.riskType = active.value // 危险点类型
+  getDangerAssessmentManageList(listQuery.value).then((res: { data: { rows: []; total: number } }) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    loading.value = false
+  })
   loading.value = false
 }
 
@@ -136,14 +165,12 @@
 const reset = () => {
   listQuery.value = {
     area: '', // 所属区域
-    deptId: '', // 所属区域
-    dangerCategory: '', // 隐患分类
-    startTime: '', // 开始时间
-    endTime: '', // 结束时间
+    deptId: '', // 所属组织
+    riskName: '', // 危险点名称
+    riskType: '', // 危险点类型
     offset: 1,
     limit: 20,
   }
-  datetimerange.value = []
   fetchData()
 }
 
@@ -154,17 +181,57 @@
 
 // 新增
 const add = (row: IList) => {
-  ElMessage.info('敬请期待')
+  switch (active.value) {
+    case '1': // 危险点
+      editPointDialogRef.value.initDialog('add')
+      break
+    case '2': // 重大危险源
+      break
+    case '3': // 危险化学品场所
+      break
+    case '4': // 危险作业
+      break
+    case '5': // 危险作业工序
+      break
+  }
   // editDialogRef.value.initDialog('add')
 }
 // 详情
 const detail = (row: IList) => {
-  editDialogRef.value.initDialog('detail', row)
+  switch (active.value) {
+    case '1': // 危险点
+      editPointDialogRef.value.initDialog('detail', row)
+      break
+    case '2': // 重大危险源
+      break
+    case '3': // 危险化学品场所
+      break
+    case '4': // 危险作业
+      break
+    case '5': // 危险作业工序
+      break
+  }
+}
+// 编辑
+const edit = (row: IList) => {
+  switch (active.value) {
+    case '1': // 危险点
+      editPointDialogRef.value.initDialog('edit', row)
+      break
+    case '2': // 重大危险源
+      break
+    case '3': // 危险化学品场所
+      break
+    case '4': // 危险作业
+      break
+    case '5': // 危险作业工序
+      break
+  }
 }
 // 删除
 const del = (row: IList) => {
   ElMessageBox.confirm(
-    `确定要删除${row.equipmentName}吗？`,
+    '确定删除吗？',
     '确认删除',
     {
       confirmButtonText: '确定',
@@ -191,7 +258,39 @@
   fetchData()
 }
 
-onMounted(() => {
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  reset()
+}
+
+watch(() => active.value, (newValue) => {
+  console.log(newValue)
+  switch (newValue) {
+    case '1': // 危险点
+      columns.value = columnsPoint
+      break
+    case '2': // 重大危险源
+      columns.value = columnsSource
+      break
+    case '3': // 危险化学品场所
+      columns.value = columnsChemistry
+      break
+    case '4': // 危险作业
+      columns.value = columnsWork
+      break
+    case '5': // 危险作业工序
+      columns.value = columnsWorkProcesses
+      break
+    default:
+      columns.value = columnsPoint
+      break
+  }
+}, { immediate: true })
+
+onMounted(async () => {
+  await getDict()
+  active.value = '1'
   fetchData()
 })
 </script>
@@ -200,19 +299,10 @@
   <app-container>
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.area" placeholder="所属区域" clearable style="width: 200px;" @change="search" />
+        <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search" @changeDept="search"/>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" placeholder="所属单位" :dept-show="true" style="width: 200px;" @change="search" />
-      </search-item>
-      <search-item>
-        <el-input v-model="listQuery.dangerCategory" placeholder="隐患分类" clearable style="width: 200px;" @change="search" />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
-          range-separator="至" start-placeholder="录入时间(开始)" end-placeholder="录入时间(结束)" @change="search"
-        />
+        <el-input v-model="listQuery.riskName" placeholder="危险点名称" clearable style="width: 200px;" />
       </search-item>
     </search-area>
     <table-container>
@@ -222,12 +312,22 @@
       </template>
       <input v-show="false" ref="fileRef" type="file" accept="xlsx/*" @change="onFileChange">
       <normal-table :query="listQuery" :list-loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" width="120" align="center">
+          <el-table-column label="操作" width="150" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" class="table-text-button" @click="detail(scope.row)">
                 详情
               </el-button>
+              <el-button type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
+                编辑
+              </el-button>
               <el-button type="danger" link size="small" class="table-text-button" @click="del(scope.row)">
                 删除
               </el-button>
@@ -237,5 +337,9 @@
       </normal-table>
     </table-container>
     <edit-dialog ref="editDialogRef" @close-refresh="search" />
+    <!-- 编辑危险点 -->
+    <edit-point-dialog ref="editPointDialogRef" />
+    <!-- 右上角按钮集合 -->
+    <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
   </app-container>
 </template>
diff --git a/src/views/alarm/dangerAssessment/manage/manage-interface.ts b/src/views/alarm/dangerAssessment/manage/manage-interface.ts
index e19c1be..3740441 100644
--- a/src/views/alarm/dangerAssessment/manage/manage-interface.ts
+++ b/src/views/alarm/dangerAssessment/manage/manage-interface.ts
@@ -1,9 +1,8 @@
 export interface IListQuery {
   area: string // 所属区域
-  deptId: string // 所属区域
-  dangerCategory: string // 隐患分类
-  startTime: string // 开始时间
-  endTime: string // 结束时间
+  deptId: string // 所属组织
+  riskName: string // 危险点名称
+  riskType: string // 危险点类型
   offset: number
   limit: number
 }
diff --git a/src/views/alarm/policyConfig/monitorPoint/drawArea.vue b/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
index e902322..6e72273 100644
--- a/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
@@ -1,4 +1,10 @@
 <script lang="ts" setup name="DrawArea">
+const props = defineProps({
+  dialogStatus: {
+    type: String,
+  },
+})
+const emits = defineEmits(['givePoints'])
 const points = ref([ // 标记点初始
   { x: 50, y: 50 }, // 左上
   { x: 150, y: 50 },
@@ -25,6 +31,9 @@
   }
 
   function drag(e: any, pointIndex: number) {
+    if (props.dialogStatus === 'detail') {
+      return
+    }
     e = e || window.event
     e.preventDefault()
     var mousePos = { x: e.clientX - canvas.getBoundingClientRect().left, y: e.clientY - canvas.getBoundingClientRect().top }
@@ -48,6 +57,9 @@
   }
 
   function addDragEvents() {
+    if (props.dialogStatus === 'detail') {
+      return
+    }
     var dragEvents = {
       dragStart(e: any) {
         e = e || window.event
@@ -98,6 +110,7 @@
 ])
 
 watch(() => points.value, () => {
+  emits('givePoints', points.value)
   style.value = [
     {
       top: `${points.value[0].y - 5}px`,
@@ -124,7 +137,7 @@
 <template>
   <div style="width: 400px;height: 300px;">
     <canvas id="myCanvas" width="400" height="300" class="canvans" />
-    <div v-for="(item, index) in points" :key="index" class="point" :style="style[index]" />
+    <div v-for="(item, index) in points" :key="index" :class="props.dialogStatus === 'detail' ? 'detail-point' : 'point'" :style="style[index]" />
   </div>
 </template>
 
@@ -158,4 +171,19 @@
     cursor: move;
   }
 }
+.detail-point {
+  width: 10px;
+  height: 10px;
+  position: absolute;
+  border-radius: 50%;
+  background-color: red;
+  opacity: 0.5;
+  top: 0;
+  left: 0;
+  z-index: 99;
+
+  &:hover {
+    cursor: not-allowed
+  }
+}
 </style>
diff --git a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
index 5a6a046..36618a7 100644
--- a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
@@ -4,13 +4,12 @@
 import { nextTick, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import type { IList as IEdgeDeviceList } from '../edgeDevice/edgeDevice-interface'
-import type { IList as ISceneList } from '../../library/scene/scene-interface'
-import type { IList as IAlgorithmList } from '../../library/algorithm/algorithm-interface'
 import type { IForm, IList } from './monitorPoint-interface'
 import drawArea from './drawArea.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { isIp } from '@/utils/validate'
-import { getDictByCode } from '@/api/system/dict'
+import { useCheckList } from '@/utils/useCheckList'
+import { getBoxList, getModelList, getRecognitionList, getSceneList, updateMonitorPoint } from '@/api/alarm/policyConfig/monitorPoint'
 const emits = defineEmits(['closeRefresh'])
 const dialogStatus = ref('add')
 const dialogVisible = ref(false) // 弹窗显示隐藏
@@ -24,121 +23,127 @@
 // 表单数据对象
 const formData: Ref<IForm> = ref({
   id: '',
-  edgeDevice: '', // 关联边缘设备
-  imageSaveInterval: 60, // 识别间隔
+  boxId: '', // 关联边缘设备id
+  deviceId: '', // 设备id
+  recognitionInterval: 60, // 识别间隔
   alarmInterval: 60, // 告警间隔
-  mode: '', // 场景模式
-  relationSceneName: '', // 业务场景
-  relationModelNames: '', // 报警对象/算法关联
-})
+  type: 1, // 场景模式
 
+  sceneId: '', // 业务场景id
+  algoModelId: '', // 模型id
+
+  recognitionUrl: '', // 识别流地址
+  rtspUrl: '', // rtsp地址
+  boundary: '', // 识别边界
+})
+const selectModelList = ref<any[]>([]) // 选择的算法
+const algorithmTableRef = ref()
 const btnLoading = ref(false) // 保存按钮加载状态
 const formDataRef = ref<FormInstance>() // 表单对象
-
-const isIpV = (rule: any, value: any, callback: any) => {
-  if (value === '') {
-    callback(new Error('ip地址必填!'))
-  }
-  else if (isIp(value)) {
-    callback()
-  }
-  else {
-    callback(new Error('IP不合法'))
-  }
-  callback()
-}
 // 校验规则
 const rules = reactive<FormRules>({
-  equipmentName: [{ required: true, message: '关联边缘设备必选', trigger: ['blur', 'change'] }],
-  imageSaveInterval: [{ required: true, message: '识别间隔必填', trigger: ['blur', 'change'] }],
+  boxId: [{ required: true, message: '关联边缘设备必选', trigger: ['blur', 'change'] }],
+  recognitionInterval: [{ required: true, message: '识别间隔必填', trigger: ['blur', 'change'] }],
   alarmInterval: [{ required: true, message: '告警间隔必填', trigger: ['blur', 'change'] }],
-  mode: [{ required: true, message: '场景模式必选', trigger: ['blur', 'change'] }],
-  relationSceneName: [{ required: true, message: '业务场景必选', trigger: ['blur', 'change'] }],
-  relationModelNames: [{ required: true, message: '报警对象必选', trigger: ['blur', 'change'] }],
+  type: [{ required: true, message: '场景模式必选', trigger: ['blur', 'change'] }],
+  sceneId: [{ required: true, message: '业务场景必选', trigger: ['blur', 'change'] }],
+  algoModelId: [{ required: true, message: '算法名称必选', trigger: ['blur', 'change'] }],
+  recognitionUrl: [{ required: true, message: '识别流地址必填', trigger: ['blur', 'change'] }],
+  rtspUrl: [{ required: true, message: 'rtsp地址必填', trigger: ['blur', 'change'] }],
 })
 
+// 算法表格表头
+const columns = ref<TableColumn[]>([
+  { text: '名称', value: 'recognitionTypeName', align: 'center', required: false },
+  { text: '置信度', value: 'confidenceLevel', align: 'center', required: true },
+  { text: '阈值', value: 'threshold', align: 'center', required: true },
+])
+
 // -------------------------------------------------------------------------------------------
-const edgeDeviceList = ref<IEdgeDeviceList[]>([]) // 边缘设备列表
-const sceneList = ref<ISceneList[]>([]) // 业务场景列表
-const algorithmList = ref<IAlgorithmList[]>([]) // 算法列表
+const edgeDeviceList: any = ref([]) // 边缘设备列表
+const sceneList: any = ref([]) // 业务场景列表
+const algorithmList: any = ref([]) // 算法列表
+const recognitionList: any = ref([]) // 报警对象列表
 // 获取边缘设备
 const fetchEdgeDeviceList = () => {
   const params = {
-    equipmentName: '', // 设备名称
-    status: '', // 在线状态
-    offset: 1,
-    limit: 999999,
+    boxName: '', // 设备名称
+    code: '', // 在线状态
+    deviceStatus: '', // 在线状态
   }
-  edgeDeviceList.value = [{
-    id: '1',
-    equipmentName: '测试数据1', // 设备名称
-    equipmentNo: '测试数据1', // 设备编号
-    area: '测试数据1', // 所属区域
-    deptName: '203', // 所属单位
-    ip: '1.0.0.0', // ip地址
-    status: '在线', // 在线状态
-  },
-  {
-    id: '2',
-    equipmentName: '测试数据2', // 设备名称
-    equipmentNo: '测试数据2', // 设备编号
-    area: '测试数据2', // 所属区域
-    deptName: '706', // 所属单位
-    ip: '1.0.0.1', // ip地址
-    status: '离线', // 在线状态
-  },
-  ]
+  getBoxList(params).then((res: any) => {
+    edgeDeviceList.value = res.data
+  })
+  console.log('获取边缘设备', edgeDeviceList.value)
 }
 
 // 获取业务场景列表
 const fetchSceneList = () => {
-  sceneList.value = [{
-    id: '1',
-    cjId: '测试数据场景id1',
-    name: '测试数据场景名称1',
-    version: 'V1.0',
-    desc: '测试数据场景描述',
-    status: '未使用',
-  },
-  {
-    id: '2',
-    cjId: '测试数据场景id2',
-    name: '测试数据场景名称2',
-    version: 'V2.0',
-    desc: '测试数据场景描述测试数据场景描述测试数据场景描述测试数据场景描述测试数据场景描述测试数据场景描述测试数据场景描述测试数据场景描述',
-    status: '使用中',
-  },
-  ]
+  const params = {
+    handleTask: '', // 任务标识
+    sceneCode: '', // 场景编码
+    sceneName: '', // 名称
+  }
+  getSceneList(params).then((res: any) => {
+    sceneList.value = res.data
+  })
 }
 
 // 获取算法列表
 const fetchAlgorithmList = () => {
-  algorithmList.value = [{
-    id: '1',
-    sfId: '测试数据算法id1',
-    name: '测试数据算法名称1',
-    version: 'V1.0',
-    desc: '测试数据算法描述',
-    status: '未使用',
-  },
-  {
-    id: '2',
-    sfId: '测试数据算法id2',
-    name: '测试数据算法名称2',
-    version: 'V2.0',
-    desc: '测试数据算法描述',
-    status: '使用中',
-  },
-  ]
+  const params = {
+    code: '', // 模型ID
+    modelName: '', // 名称
+  }
+  getModelList(params).then((res: any) => {
+    algorithmList.value = res.data
+  })
 }
 
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
+  if (`${formData.value.type}` === '0') { // 算法关联
+    if (!selectModelList.value.length) {
+      ElMessage.warning('请选择报警对象')
+      return false
+    }
+    if (!useCheckList(selectModelList.value, columns.value, '报警对象')) {
+      return false
+    }
+  }
   if (formDataRef.value) {
     formDataRef.value?.validate((valid: boolean) => {
       if (valid) {
-        ElMessage.info('敬请期待')
+        selectModelList.value.forEach((item: any) => {
+          const index = recognitionList.value.findIndex((i: { id: string }) => i.id === item.id)
+          if (index !== -1) {
+            recognitionList.value.splice(index, 1, { ...item, isUse: '1' })
+          }
+          else {
+            recognitionList.value.splice(index, 1, { ...item, isUse: '0' })
+          }
+        })
+        const params = {
+          ...formData.value,
+          sceneRelation: formData.value.type === 1 ? { id: formData.value.id, sceneId: formData.value.sceneId } : null,
+          // eslint-disable-next-line multiline-ternary
+          deviceModelRelations: formData.value.type === 0 ? recognitionList.value.map((item: any) => {
+            return {
+              ...item,
+              algoModelId: formData.value.algoModelId, // 算法模型id
+              confidenceLevel:	item.confidenceLevel, // 置信度
+              isUse: item.isUse,
+              recognitionTypeId:	item.recognitionTypeId, // 模型识别类型
+              threshold: item.threshold,	 // 阈值
+            }
+          }) : [],
+        }
+        console.log('要传的参数', params)
+        updateMonitorPoint(params).then(() => {
+          ElMessage.success('设置成功')
+          closeRefresh()
+        })
       }
     })
   }
@@ -148,26 +153,74 @@
 function resetForm() {
   formData.value = {
     id: '',
-    edgeDevice: '', // 关联边缘设备
-    imageSaveInterval: 60, // 识别间隔
+    boxId: '', // 关联边缘设备id
+    deviceId: '', // 设备id
+    recognitionInterval: 60, // 识别间隔
     alarmInterval: 60, // 告警间隔
-    mode: '', // 场景模式
-    relationSceneName: '', // 业务场景
-    relationModelNames: '', // 报警对象/算法关联
+    type: 1, // 场景模式
+
+    sceneId: '', // 业务场景id
+    algoModelId: '', // 模型id
+
+    recognitionUrl: '', // 识别流地址
+    rtspUrl: '', // rtsp地址
+    boundary: '', // 识别边界
   }
+  edgeDeviceList.value = [] // 边缘设备列表
+  sceneList.value = [] // 业务场景列表
+  algorithmList.value = [] // 算法列表
+  recognitionList.value = [] // 报警对象列表
 }
 
-// 选择的算法
-const selectModelList = ref<any[]>([])
 const selectModel = (value: any) => {
   selectModelList.value = value
-  formData.value.relationModelNames = value.map((item: any) => item.name).join(',')
 }
 
 // -----------------------------------初始化、关闭对话框相关-----------------------------------------
-function initDialog(dialogstatus: string, row: IList) {
-  dialogStatus.value = dialogstatus // 类型 新建add 编辑edit 详情detail
+function initDialog(dialogstatus: string, row: any) {
   dialogVisible.value = true
+  fetchEdgeDeviceList() // 获取边缘设备列表
+  fetchAlgorithmList() // 获取算法列表
+  fetchSceneList() // 业务场景列表
+  if (dialogstatus === 'edit' || dialogstatus === 'detail') {
+    formData.value.boxId = row.boxId // 边缘设备id
+    formData.value.recognitionInterval = row.recognitionInterval || 60 // 识别间隔
+    formData.value.alarmInterval = row.alarmInterval || 60 // 告警间隔
+    formData.value.type = row.type // 场景模式
+    formData.value.id = row.id // id
+    formData.value.deviceId = row.deviceId // 设备id
+    formData.value.recognitionUrl = row.recognitionUrl || 'http://192.168.83.42/recognitionUrl'// 识别流地址
+    formData.value.rtspUrl = row.rtspUrl || 'http://192.168.83.42/rtsp' // rtsp地址
+    // formData.value.boundary = formData.value.boundary ? JSON.parse(formData.value.boundary) : formData.value.boundary // 识别边界
+    if (`${row.type}` === '0') { // 算法关联
+      formData.value.algoModelId = row.deviceModelRelations && row.deviceModelRelations.length && row.deviceModelRelations[0].algoModelId // 模型id
+      recognitionList.value = row.deviceModelRelations.map((item: any) => {
+        return {
+          ...item,
+          confidenceLevel: `${item.confidenceLevel}` ? Number(item.confidenceLevel) : undefined,
+          threshold: `${item.threshold}` ? Number(item.threshold) : undefined,
+        }
+      })
+
+      // 恢复选中状态
+      const selectedRows = recognitionList.value.filter((item: any) => `${item.isUse}` === '1')
+      if (selectedRows && Array.isArray(selectedRows) && selectedRows.length) {
+        nextTick(() => {
+          selectedRows.forEach((row: any) => {
+            algorithmTableRef.value?.toggleRowSelection(row, true)
+          })
+        })
+      }
+    }
+    else if (`${row.type}` === '1') { // 业务场景
+      formData.value.sceneId = row.sceneRelation.sceneId
+    }
+  }
+
+  if (dialogstatus === 'detail') {
+    formDataRef.value?.clearValidate()
+  }
+  dialogStatus.value = dialogstatus // 类型 新建add 编辑edit 详情detail
   btnLoading.value = false
 }
 
@@ -177,57 +230,73 @@
   resetForm()
   emits('closeRefresh')
 }
-// 关闭弹窗
-function dialogClose() {
-  dialogVisible.value = false
-  resetForm()
-  closeRefresh()
+
+// 监听算法变化，查询算法报警对象
+const changeAlgoModelId = (newValue: string) => {
+  if (newValue) {
+    // 获取场景对象
+    const params = {
+      modelId: newValue, // 模型ID
+      typeCode: '', // 类型编码
+      typeName: '', // 类型名称
+    }
+    getRecognitionList(params).then((res) => {
+      recognitionList.value = res.data.map((item: { id: string; typeName: string }) => {
+        return {
+          ...item,
+          recognitionTypeName: item.typeName,
+          recognitionTypeId: item.id,
+          id: '',
+        }
+      })
+    })
+  }
 }
 
-onMounted(() => {
-  fetchEdgeDeviceList() // 获取边缘设备列表
-  fetchSceneList() // 业务场景列表
-  fetchAlgorithmList() // 获取算法列表
-})
+const givePoints = (value: any) => {
+  formData.value.boundary = JSON.stringify(value)
+}
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
 </script>
 
 <template>
   <el-dialog
-    v-model="dialogVisible" :title="textMap[dialogStatus]" width="1200" :before-close="dialogClose" append-to-body
+    v-model="dialogVisible" :title="textMap[dialogStatus]" width="800" :before-close="closeRefresh" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
     <el-row :gutter="30">
-      <el-col :span="15">
+      <el-col :span="24">
         <el-form
           ref="formDataRef" :model="formData" :rules="rules" label-position="right" label-width="130px"
-          class="form-container" size="default" @submit.prevent
+          class="form-container" size="default" :disabled="dialogStatus === 'detail'" @submit.prevent
         >
           <el-row :gutter="10">
             <el-col :span="24" class="grid-cell">
-              <el-form-item label="关联边缘设备" prop="equipmentName" class="required">
+              <el-form-item label="关联边缘设备" prop="boxId" class="required">
                 <el-select
-                  v-model="formData.edgeDevice"
+                  v-model="formData.boxId"
                   placeholder="关联边缘设备"
                   clearable
                   filterable
+                  :disabled="dialogStatus === 'detail'"
                 >
-                  <el-option v-for="item of edgeDeviceList" :key="item.id" :label="item.equipmentName" :value="item.id" >
+                  <el-option v-for="item of edgeDeviceList" :key="item.id" :label="item.boxName" :value="item.id">
                     <div style="display: flex;justify-content: space-between;">
-                      <span style="font-weight: 600;">{{ item.equipmentName }}</span>
-                      <span style="color: #8492a6; font-size: 13px">{{ item.area }}</span>
-                      <span style="color: #8492a6; font-size: 13px">{{ item.deptName }}</span>
+                      <span style="font-weight: 600;">{{ item.boxName }}</span>
+                      <span style="color: #8492a6; font-size: 13px" :style="{ color: `${item.deviceStatus}` === '0' ? '#0e932e' : '#979797' }">{{ `${item.deviceStatus}` === '0' ? '在线' : '离线' }}</span>
+                      <span style="color: #8492a6; font-size: 13px">{{ item.ip }}</span>
                     </div>
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="14">
-              <el-form-item label="识别间隔(s)" prop="imageSaveInterval">
+              <el-form-item label="识别间隔(s)" prop="recognitionInterval">
                 <el-input-number
-                  v-model="formData.imageSaveInterval" class="full-width-input"
+                  v-model="formData.recognitionInterval" class="full-width-input"
                   :min="1" :precision="0" :step="1" placeholder="必填"
+                  :disabled="dialogStatus === 'detail'"
                 />
               </el-form-item>
             </el-col>
@@ -236,34 +305,53 @@
                 <el-input-number
                   v-model="formData.alarmInterval" class="full-width-input"
                   :min="1" :precision="0" :step="1" placeholder="必填"
+                  :disabled="dialogStatus === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="14">
+              <el-form-item label="rtsp地址" prop="rtspUrl">
+                <el-input
+                  v-model="formData.rtspUrl" class="full-width-input"
+                  placeholder="必填"
+                  :disabled="dialogStatus === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="14">
+              <el-form-item label="识别流地址 " prop="recognitionUrl">
+                <el-input
+                  v-model="formData.recognitionUrl" class="full-width-input"
+                  placeholder="必填"
+                  :disabled="dialogStatus === 'detail'"
                 />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="24">
-              <el-form-item label="场景模式" prop="mode">
-                <el-radio-group v-model="formData.mode">
-                  <el-radio label="2">
+              <el-form-item label="场景模式" prop="type">
+                <el-radio-group v-model="formData.type" :disabled="dialogStatus === 'detail'">
+                  <el-radio :label="1">
                     业务场景
                   </el-radio>
-                  <el-radio label="1">
+                  <el-radio :label="0">
                     算法关联
                   </el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="formData.mode === '2'" :gutter="24">
+          <el-row v-if="formData.type === 1" :gutter="24">
             <el-col :span="24">
-              <el-form-item label="业务场景" prop="relationSceneName">
+              <el-form-item label="业务场景" prop="sceneId">
                 <el-select
-                  v-model="formData.relationSceneName" placeholder="业务场景" clearable class="select"
-                  style="width: 100%;"
+                  v-model="formData.sceneId" placeholder="业务场景" clearable class="select"
+                  style="width: 100%;" :disabled="dialogStatus === 'detail'"
                 >
-                  <el-option v-for="item in sceneList" :key="item.id" :value="item.name" :label="item.name">
+                  <el-option v-for="item in sceneList" :key="item.id" :value="item.id" :label="item.sceneName">
                     <div style="display: flex;justify-content: space-between;">
-                      <span style="font-weight: 600;">{{ item.name }}</span>
+                      <span style="font-weight: 600;">{{ item.sceneName }}</span>
                       <span style="color: #8492a6; font-size: 13px">{{ item.version }}</span>
                     </div>
                   </el-option>
@@ -271,54 +359,74 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="formData.mode === '1'" :gutter="24">
+          <el-row v-if="formData.type === 0" :gutter="24">
             <el-col :span="24">
-              <el-form-item label="算法关联" prop="relationModelNames">
+              <el-form-item label="算法名称" prop="algoModelId">
+                <el-select
+                  v-model="formData.algoModelId" placeholder="请选择算法" clearable class="select"
+                  style="width: 100%;" :disabled="dialogStatus === 'detail'"
+                  @change="changeAlgoModelId"
+                >
+                  <el-option v-for="item in algorithmList" :key="item.id" :value="item.id" :label="item.modelName">
+                    <div style="display: flex;justify-content: space-between;">
+                      <span style="font-weight: 600;">{{ item.modelName }}</span>
+                      <span style="color: #8492a6; font-size: 13px">{{ item.version }}</span>
+                    </div>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="formData.type === 0" :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="报警对象">
                 <el-table
-                  ref="multipleTableRef" :data="algorithmList" border stripe style="width: 100%;"
+                  ref="algorithmTableRef" :data="recognitionList" border stripe style="width: 100%;"
                   max-height="400px" @selection-change="selectModel"
                 >
-                  <el-table-column label="算法名称" align="center" value="name">
-                    <template #default="scope">
-                      {{ scope.row.name }}
+                  <el-table-column
+                    v-for="item in columns"
+                    :key="item.value"
+                    :prop="item.value"
+                    :label="item.text"
+                    align="center"
+                  >
+                    <template #header>
+                      <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
                     </template>
-                  </el-table-column>
-                  <el-table-column label="置信度" align="center">
                     <template #default="scope">
                       <el-input-number
-                        v-model="scope.row.customThreshold"
-                        :min="1"
-                        :precision="0.01"
+                        v-if="dialogStatus !== 'detail' && (item.value === 'confidenceLevel' || item.value === 'threshold')"
+                        v-model="scope.row[item.value]"
+                        :min="0"
+                        :precision="2"
                         controls-position="right"
                       />
+                      <!-- <el-input-number v-if="item.value === 'threshold'" v-model="scope.row[item.value]" controls-position="right" :min="0" /> -->
+                      <span v-else>{{ scope.row[item.value] }}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column label="阈值" align="center">
-                    <template #default="scope">
-                      <el-input-number v-model="scope.row.customThreshold" controls-position="right" :min="0" />
-                    </template>
-                  </el-table-column>
-                  <el-table-column type="selection" width="55" align="center" />
+                  <el-table-column :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
                 </el-table>
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
       </el-col>
-      <el-col :span="8">
+      <!-- <el-col :span="8">
         <span style="display: block;font-weight: 600; margin-bottom: 6px;font-size: 14px;">区域绘制</span>
         <div id="draw-area" class="draw">
-          <draw-area />
-          <span style="margin-top: 10px;font-size: 11px;color: red;">注意：请绘制出一个四边形</span>
+          <draw-area :dialog-status="dialogStatus" @givePoints="givePoints"/>
+          <span v-if="dialogStatus !== 'detail'" style="margin-top: 10px;font-size: 11px;color: red;">注意：请绘制出一个四边形</span>
         </div>
-      </el-col>
+      </el-col> -->
     </el-row>
     <template #footer>
-      <div v-show="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button :loading="btnLoading" type="primary" @click="submitForm">
+      <div class="dialog-footer">
+        <el-button v-if="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
-        <el-button @click="dialogClose">
+        <el-button @click="closeRefresh">
           取消
         </el-button>
       </div>
diff --git a/src/views/alarm/policyConfig/monitorPoint/list.vue b/src/views/alarm/policyConfig/monitorPoint/list.vue
index 5c93a17..eb94812 100644
--- a/src/views/alarm/policyConfig/monitorPoint/list.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/list.vue
@@ -6,6 +6,7 @@
 import type { IList, IListQuery } from './monitorPoint-interface'
 import EditDialog from './editDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getMonitorPointList } from '@/api/alarm/policyConfig/monitorPoint'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
@@ -16,34 +17,33 @@
 const loading = ref(false)
 // 默认查询条件
 const listQuery: Ref<IListQuery> = ref({
-  equipmentName: '', // 设备名称
-  status: '', // 在线状态
+  deviceName: '', // 设备名称
+  deviceStatus: '', // 在线状态
   offset: 1,
   limit: 20,
 })
 // 表格表头
 const columns: Ref<TableColumn[]> = ref([
-  { text: '摄像头名称', value: 'equipmentName', align: 'center' },
-  { text: '摄像头编号', value: 'equipmentNo', align: 'center' },
+  { text: '摄像头名称', value: 'deviceName', align: 'center' },
+  { text: '摄像头编号', value: 'deviceNo', align: 'center' },
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '关联边缘设备', value: 'edgeDevice', align: 'center' },
-  { text: 'RTSP地址', value: 'rtsp', align: 'center' },
-  { text: '识别间隔(s)', value: 'imageSaveInterval', align: 'center' },
+  { text: '关联边缘设备', value: 'boxName', align: 'center' },
+  { text: 'RTSP地址', value: 'rtspUrl', align: 'center' },
+  { text: '识别间隔(s)', value: 'recognitionInterval', align: 'center' },
   { text: '告警间隔(s)', value: 'alarmInterval', align: 'center' },
-  { text: '业务场景', value: 'relationSceneName', align: 'center' },
-  { text: '报警对象', value: 'relationModelNames', align: 'center' },
-  // { text: '在线状态', value: 'status', align: 'center' },
+  { text: '业务场景', value: 'typeName', align: 'center' },
+  { text: '报警对象', value: 'recognitionTypeName', align: 'center' },
 ])
 const total = ref(0) // 数据条数
 const list = ref<IList[]>([]) // 数据条数
 const checkoutList = ref<IList[]>([]) // 数据条数
 
 // ------------------------------------字典------------------------------------------
-const statusList = ref<dictType[]>([]) // 在线状态
+const deviceStatusList = ref<dictType[]>([]) // 在线状态
 const getDict = () => {
   // 在线状态
   getDictByCode('status').then((response) => {
-    statusList.value = response.data
+    deviceStatusList.value = response.data
   })
 }
 getDict()
@@ -52,52 +52,26 @@
 // 查询数据
 const fetchData = () => {
   loading.value = true
-  // getDevListPage(listQuery).then((res: { data: { rows: []; total: number } }) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loading.value = false
-  // })
-  list.value = [{
-    id: '1',
-    equipmentName: '测试数据1', // 设备名称
-    equipmentNo: '测试数据1', // 设备编号
-    // area: '测试数据1', // 所属区域
-    deptName: '测试数据1', // 所属单位
-    edgeDevice: '测试数据1', // 关联边缘设备
-    rtsp: '测试数据1', // RTSP地址
-    imageSaveInterval: 20, // 识别间隔
-    alarmInterval: 20, // 告警间隔
-    relationSceneName: '测试数据1', // 业务场景
-    relationModelNames: '测试数据1', // 报警对象
-    mode: '1',
-    status: '在线', // 在线状态
-    deptId: '测试数据1', // 所属单位id
-  },
-  {
-    id: '2',
-    equipmentName: '测试数据2', // 设备名称
-    equipmentNo: '测试数据2', // 设备编号
-    // area: '测试数据2', // 所属区域
-    deptName: '测试数据2', // 所属单位
-    edgeDevice: '测试数据2', // 关联边缘设备
-    rtsp: '测试数据2', // RTSP地址
-    imageSaveInterval: 20, // 识别间隔
-    alarmInterval: 20, // 告警间隔
-    mode: '2',
-    relationSceneName: '测试数据2', // 业务场景
-    relationModelNames: '测试数据2', // 报警对象
-    status: '离线', // 在线状态
-    deptId: '测试数据2', // 所属单位id
-  },
-  ]
+  getMonitorPointList(listQuery.value).then((res: { data: { rows: []; total: number } }) => {
+    list.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        typeName: `${item.type}` === '1' ? item.sceneRelation.sceneName : '/', // 业务场景
+        recognitionTypeName: `${item.type}` === '0' ? item.deviceModelRelations.map((i: { recognitionTypeName: any }) => i.recognitionTypeName).join(',') : '/', // 报警对象
+      }
+    })
+    total.value = res.data.total
+    loading.value = false
+  })
+
   loading.value = false
 }
 
 // 搜索重置
 const reset = () => {
   listQuery.value = {
-    equipmentName: '', // 设备名称
-    status: '', // 在线状态
+    deviceName: '', // 设备名称
+    deviceStatus: '', // 在线状态
     offset: 1,
     limit: 20,
   }
@@ -120,7 +94,7 @@
 // 删除
 const del = (row: IList) => {
   ElMessageBox.confirm(
-    `确定要删除${row.equipmentName}吗？`,
+    `确定要删除${row.deviceName}吗？`,
     '确认删除',
     {
       confirmButtonText: '确定',
@@ -156,31 +130,38 @@
   <app-container>
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.equipmentName" placeholder="设备名称" clearable style="width: 200px;" @change="search" />
+        <el-input v-model="listQuery.deviceName" placeholder="摄像头名称" clearable style="width: 200px;" @change="search" />
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.status"
+          v-model="listQuery.deviceStatus"
           placeholder="在线状态"
           style="width: 220px;"
           clearable
           @change="search"
         >
-          <el-option v-for="item of statusList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-option v-for="item of deviceStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <normal-table :query="listQuery" :list-loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="在线状态" align="center" width="120">
             <template #default="scope">
-              <el-tag :type="scope.row.status === '在线' ? 'success' : 'danger'">
-                {{ scope.row.status }}
+              <el-tag v-if="scope.row.deviceStatusName" :type="scope.row.deviceStatusName === '在线' ? 'success' : 'danger'">
+                {{ scope.row.deviceStatusName }}
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="120" align="center">
+          <el-table-column label="操作" width="120" align="center" fixed="right">
             <template #default="scope">
               <el-button type="primary" link size="small" class="table-text-button" @click="detail(scope.row)">
                 详情
diff --git a/src/views/alarm/policyConfig/monitorPoint/monitorPoint-interface.ts b/src/views/alarm/policyConfig/monitorPoint/monitorPoint-interface.ts
index f8d031a..144dc5c 100644
--- a/src/views/alarm/policyConfig/monitorPoint/monitorPoint-interface.ts
+++ b/src/views/alarm/policyConfig/monitorPoint/monitorPoint-interface.ts
@@ -1,33 +1,44 @@
 export interface IListQuery {
-  equipmentName: string // 设备名称
-  status: string // 在线状态
+  deviceName: string // 设备名称
+  deviceStatus: string // 在线状态
   offset: number
   limit: number
 }
 
 export interface IList {
   id: string // 主键
-  equipmentName: string // 设备名称
+  deviceName: string // 设备名称
   equipmentNo: string // 设备编号
   // area: string // 所属区域
   deptName: string // 所属单位
   edgeDevice: string // 关联边缘设备
   rtsp: string // RTSP地址
   imageSaveInterval: number // 识别间隔
-  alarmInterval: number // 告警间隔
   relationSceneName: string // 业务场景
   mode: string // 场景模式
   relationModelNames: string // 报警对象
-  status: string // 在线状态
+  deviceStatus: string // 在线状态
   deptId?: string // 所属单位id
+
+  boxId: string // 边缘设备id
+  deviceId: string // 设备id
+  recognitionInterval: number // 识别间隔
+  alarmInterval: number // 告警间隔
+  type: number // 场景模式
 }
 
 export interface IForm {
-  id: string // 数据id
-  edgeDevice: string // 关联边缘设备
-  imageSaveInterval: number // 识别间隔
+  id: string
+  boxId: string // 关联边缘设备id
+  deviceId: string // 设备id
+  recognitionInterval: number // 识别间隔
   alarmInterval: number // 告警间隔
-  mode: string // 场景模式
-  relationSceneName: string // 业务场景
-  relationModelNames: string // 报警对象/算法关联
+  type: number // 场景模式
+
+  sceneId: string // 业务场景id
+  algoModelId: string // 模型id
+
+  recognitionUrl: string // 识别流地址
+  rtspUrl: string // rtsp地址
+  boundary: string // 识别边界
 }
diff --git a/src/views/monitor/deviceManage/editDev.vue b/src/views/monitor/deviceManage/editDev.vue
index a054f59..0ad0669 100644
--- a/src/views/monitor/deviceManage/editDev.vue
+++ b/src/views/monitor/deviceManage/editDev.vue
@@ -360,8 +360,8 @@
             <el-input :value="formData.areaName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必选" @click="openAreaSelect" />
           </el-form-item>
         </el-col>
-        <el-col :span="12" class="grid-cell">
-          <el-form-item label="所属单位" prop="deptId" class="required">
+        <el-col :span="12">
+          <el-form-item label="所属单位" prop="deptId">
             <dept-select v-model="formData.deptId" :disabled="dialogStatus === 'detail'" :dept-show="true" />
           </el-form-item>
         </el-col>
diff --git a/src/views/smGateway.vue b/src/views/smGateway.vue
index 9deef7d..5ad7a4e 100644
--- a/src/views/smGateway.vue
+++ b/src/views/smGateway.vue
@@ -138,7 +138,7 @@
 
         // ======================认证成功跳转首页=======================
         // const token = authResult.token
-        const token = '7e9ad558-b651-416b-aed5-af54906360d5'
+        const token = authResult.casicToken
         localStorage.setItem('token', token)
         await userStore.setToken(token)
         router.push({ path: '/dashboard' })