diff --git a/src/api/common.ts b/src/api/common.ts
new file mode 100644
index 0000000..cdfffe6
--- /dev/null
+++ b/src/api/common.ts
@@ -0,0 +1,16 @@
+import request from './index'
+// 获取文件地址
+export function getFileUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
+// 上传文件
+export function uploadFile(data: FormData) {
+  return request({
+    url: 'minio/file/upload',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/common.ts b/src/api/common.ts
new file mode 100644
index 0000000..cdfffe6
--- /dev/null
+++ b/src/api/common.ts
@@ -0,0 +1,16 @@
+import request from './index'
+// 获取文件地址
+export function getFileUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
+// 上传文件
+export function uploadFile(data: FormData) {
+  return request({
+    url: 'minio/file/upload',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/page/database.ts b/src/api/page/database.ts
new file mode 100644
index 0000000..7715aa5
--- /dev/null
+++ b/src/api/page/database.ts
@@ -0,0 +1,62 @@
+/**
+ * 管线占压相关接口
+ */
+import request from '../index'
+// 列表查询
+export function getOverListPage(params: any) {
+  return request({
+    url: `/system/busPipeOverstock/listPage?offset=${params.offset}&limit=${params.limit}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 导出
+export function exporOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/export',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 删除
+export function batchDeleteOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/delete',
+    method: 'post',
+    data: params,
+  })
+}
+// 模板下载
+export function templateOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/template',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 导入
+export function importOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/import',
+    method: 'post',
+    data: params,
+  })
+}
+// 新建
+export function addOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/add',
+    method: 'post',
+    data: params,
+  })
+}
+// 编辑
+export function editOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/edit',
+    method: 'post',
+    data: params,
+  })
+}

diff --git a/src/api/common.ts b/src/api/common.ts
new file mode 100644
index 0000000..cdfffe6
--- /dev/null
+++ b/src/api/common.ts
@@ -0,0 +1,16 @@
+import request from './index'
+// 获取文件地址
+export function getFileUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
+// 上传文件
+export function uploadFile(data: FormData) {
+  return request({
+    url: 'minio/file/upload',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/page/database.ts b/src/api/page/database.ts
new file mode 100644
index 0000000..7715aa5
--- /dev/null
+++ b/src/api/page/database.ts
@@ -0,0 +1,62 @@
+/**
+ * 管线占压相关接口
+ */
+import request from '../index'
+// 列表查询
+export function getOverListPage(params: any) {
+  return request({
+    url: `/system/busPipeOverstock/listPage?offset=${params.offset}&limit=${params.limit}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 导出
+export function exporOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/export',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 删除
+export function batchDeleteOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/delete',
+    method: 'post',
+    data: params,
+  })
+}
+// 模板下载
+export function templateOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/template',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 导入
+export function importOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/import',
+    method: 'post',
+    data: params,
+  })
+}
+// 新建
+export function addOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/add',
+    method: 'post',
+    data: params,
+  })
+}
+// 编辑
+export function editOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/edit',
+    method: 'post',
+    data: params,
+  })
+}
diff --git a/src/api/page/undergroundCavity.TS b/src/api/page/undergroundCavity.TS
new file mode 100644
index 0000000..afd0c20
--- /dev/null
+++ b/src/api/page/undergroundCavity.TS
@@ -0,0 +1,70 @@
+/**
+ * 地下空洞相关接口
+ */
+import request from '../index'
+// 列表查询
+export function getHoleListPage(params: any) {
+  return request({
+    url: `/system/busHole/listPage?offset=${params.offset}&limit=${params.limit}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 新建
+export function addHole(params: any) {
+  return request({
+    url: '/system/busHole/add',
+    method: 'post',
+    data: params,
+  })
+}
+// 编辑
+export function editHole(params: any) {
+  return request({
+    url: '/system/busHole/edit',
+    method: 'post',
+    data: params,
+  })
+}
+// 详情
+export function detailHole(params: any) {
+  return request({
+    url: '/system/busHole/detail',
+    method: 'post',
+    data: params,
+  })
+}
+// 导出
+export function exportHole(params: any) {
+  return request({
+    url: '/system/busHole/export',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 删除
+export function batchDeleteHole(params: any) {
+  return request({
+    url: '/system/busHole/delete',
+    method: 'post',
+    data: params,
+  })
+}
+// 模板下载
+export function templateHole(params: any) {
+  return request({
+    url: '/system/busHole/template',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 导入
+export function importHole(params: any) {
+  return request({
+    url: '/system/busHole/import',
+    method: 'post',
+    data: params,
+  })
+}

diff --git a/src/api/common.ts b/src/api/common.ts
new file mode 100644
index 0000000..cdfffe6
--- /dev/null
+++ b/src/api/common.ts
@@ -0,0 +1,16 @@
+import request from './index'
+// 获取文件地址
+export function getFileUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
+// 上传文件
+export function uploadFile(data: FormData) {
+  return request({
+    url: 'minio/file/upload',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/page/database.ts b/src/api/page/database.ts
new file mode 100644
index 0000000..7715aa5
--- /dev/null
+++ b/src/api/page/database.ts
@@ -0,0 +1,62 @@
+/**
+ * 管线占压相关接口
+ */
+import request from '../index'
+// 列表查询
+export function getOverListPage(params: any) {
+  return request({
+    url: `/system/busPipeOverstock/listPage?offset=${params.offset}&limit=${params.limit}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 导出
+export function exporOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/export',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 删除
+export function batchDeleteOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/delete',
+    method: 'post',
+    data: params,
+  })
+}
+// 模板下载
+export function templateOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/template',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 导入
+export function importOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/import',
+    method: 'post',
+    data: params,
+  })
+}
+// 新建
+export function addOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/add',
+    method: 'post',
+    data: params,
+  })
+}
+// 编辑
+export function editOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/edit',
+    method: 'post',
+    data: params,
+  })
+}
diff --git a/src/api/page/undergroundCavity.TS b/src/api/page/undergroundCavity.TS
new file mode 100644
index 0000000..afd0c20
--- /dev/null
+++ b/src/api/page/undergroundCavity.TS
@@ -0,0 +1,70 @@
+/**
+ * 地下空洞相关接口
+ */
+import request from '../index'
+// 列表查询
+export function getHoleListPage(params: any) {
+  return request({
+    url: `/system/busHole/listPage?offset=${params.offset}&limit=${params.limit}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 新建
+export function addHole(params: any) {
+  return request({
+    url: '/system/busHole/add',
+    method: 'post',
+    data: params,
+  })
+}
+// 编辑
+export function editHole(params: any) {
+  return request({
+    url: '/system/busHole/edit',
+    method: 'post',
+    data: params,
+  })
+}
+// 详情
+export function detailHole(params: any) {
+  return request({
+    url: '/system/busHole/detail',
+    method: 'post',
+    data: params,
+  })
+}
+// 导出
+export function exportHole(params: any) {
+  return request({
+    url: '/system/busHole/export',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 删除
+export function batchDeleteHole(params: any) {
+  return request({
+    url: '/system/busHole/delete',
+    method: 'post',
+    data: params,
+  })
+}
+// 模板下载
+export function templateHole(params: any) {
+  return request({
+    url: '/system/busHole/template',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 导入
+export function importHole(params: any) {
+  return request({
+    url: '/system/busHole/import',
+    method: 'post',
+    data: params,
+  })
+}
diff --git a/src/views/main/database/detail.vue b/src/views/main/database/detail.vue
index 31d6a63..a798fc6 100644
--- a/src/views/main/database/detail.vue
+++ b/src/views/main/database/detail.vue
@@ -1,10 +1,10 @@
 <!-- 管线占压详情 -->
 <script lang="ts" setup name="GanDetail">
-import type { FormRules } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import mapDialog from './mapDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
-// import { getGasDetail } from '@/api/page/gas'
+import { addOver, editOver } from '@/api/page/database'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -14,93 +14,196 @@
   update: '编辑',
   detail: '详情',
 })
-const areaForm = ref({
+const areaForm = ref<{ [key: string]: string }>({
+  serialNumber: '', // 序号
+  hiddenDangerNumber: '', // 隐患标号
+  primaryClassification: '', // 一级分类
+  secondaryClassification: '', // 二级分类
+  hiddenDangerDescription: '', // 隐患描述
+  pipeNetworkType: '', // 管网类型
+  equipmentNumber: '', // 编码
+  location: '', // 地点
+  longitude: '', // 经度
+  latitude: '', // 纬度
+  whetherItIsInTheCommunity: '', // 是否在小区内
+  occupyingType: '', // 小区内占压类型
+  communityName: '', // 小区名称
+  discoveryTime: '', // 发现时间
+  hiddenDangerLevel: '', // 隐患等级
+  responsibleManagementEnterprise: '', // 责任管理企业
+  personInCharge: '', // 责任人
+  plannedEliminationTimeLimit: '', // 计划消除时限
+  governanceSituation: '', // 治理情况
+  eliminationTime: '', // 消除时间
+  propertyRightNature: '', // 产权性质
+  remark: '', // 备注
+  occupiedEnterprisePersonalName: '', // 占压企业/个人名称
+  occupationUnitProperty: '', // 占压单位性质
+  dateOfConstructionOfTheOccupation: '', // 占压物建成年份
+  anyApprovalDocumentsForTheConstruction: '', // 有无占压物批准文件
+  useOfTheOccupation: '', // 占压物用途
+  descriptionOfTheOccupation: '', // 占压物描述
+  areThereRegularStaffActivities: '', // 有无经常性人员活动
+  areaOfOccupation: '', // 占压物面积
+  whetherThereAreConditionsForRelocation: '', // 占压物面积
+  yearOfUse: '', // 年代类别
+  yearOfCommencementOfOperation: '', // 年份
+  isThereAnyPipelineConstructionApprovalDocument: '', // 有无建设批准文件
+  pipelineDepth: '', // 管线埋深
+  pipeDiameter: '', // 管径
+  linePressure: '', // 管线压力
+  pipelineLength: '', // 占压管线长度
+  whetherItIsIncludedInTheTechnicalReformPlan: '', // 是否纳入技改计划
+  technicalTransformationProjectNumber: '', // 技改项目号
+  preventionAndControlMeasures: '', // 防控措施
+  governancePlan: '', // 治理计划
+  purchaseRestrictionOrGasShutdown: '', // 限购或停气情况
+  nameOfTheDiversionProject: '', // 改线工程名称
+  numberOfTheDiversionProject: '', // 改线工程编号
+  progressStatisticsOfTheDiversionProject: '', // 改线进度统计
+  contactPerson: '', // 与区县对接联系人
+  superOccupyingPressureClassification: '', // 特级占压分类情况
 }) // 表单
 const rules: FormRules = {
+  hiddenDangerNumber: [{ required: true, message: '隐患编号必填', trigger: ['blur', 'change'] }],
+  primaryClassification: [{ required: true, message: '一级分类必填', trigger: ['blur', 'change'] }],
+  secondaryClassification: [{ required: true, message: '二级分类必填', trigger: ['blur', 'change'] }],
+  hiddenDangerDescription: [{ required: true, message: '隐患描述必填', trigger: ['blur', 'change'] }],
+  pipeNetworkType: [{ required: true, message: '管网类型必填', trigger: ['blur', 'change'] }],
+  equipmentNumber: [{ required: true, message: '编码必填', trigger: ['blur', 'change'] }],
+  location: [{ required: true, message: '地点必填', trigger: ['blur', 'change'] }],
+  discoveryTime: [{ required: true, message: '发现时间必选', trigger: ['blur', 'change'] }],
+  hiddenDangerLevel: [{ required: true, message: '隐患等级必选', trigger: ['blur', 'change'] }],
+  responsibleManagementEnterprise: [{ required: true, message: '责任管理企业必填', trigger: ['blur', 'change'] }],
+  personInCharge: [{ required: true, message: '责任人必填', trigger: ['blur', 'change'] }],
+  governanceSituation: [{ required: true, message: '治理情况必填', trigger: ['blur', 'change'] }],
 } // 前端校验规则
-// 获取处置原因
-const cancelReasonList = ref<{ name: string;value: string;id: string }[]>()
+// 获取字典
+const whetherItIsInTheCommunity = ref<{ name: string;value: string;id: string }[]>() // 是否在小区内
+const hiddenDangerLevel = ref<{ name: string;value: string;id: string }[]>() // 隐患等级
 const fetchDict = () => {
-  getDictByCode('alarmHandlerReason').then((res) => {
-    cancelReasonList.value = res.data
+  getDictByCode('isAlarm').then((res) => {
+    whetherItIsInTheCommunity.value = res.data
+  })
+  getDictByCode('hiddenDangerLevel').then((res) => {
+    hiddenDangerLevel.value = res.data
   })
 }
 fetchDict()
-// 初始化对话框
-const initDialog = (type: string, row: any) => {
-  dialogFormVisible.value = true
-  dialogFormTyle.value = type
-  areaForm.value = row
+
+// 重置
+const resetForm = () => {
+  areaForm.value
+  for (const i in areaForm.value) {
+    areaForm.value[i] = ''
+  }
+  nextTick(() => {
+    dataFormRef.value?.clearValidate()
+  })
 }
-defineExpose({
-  initDialog,
-})
 // 取消
 const cancel = () => {
+  resetForm()
   dialogFormVisible.value = false
 }
+// 保存数据
+const saveData = () => {
+  // addHole
+  // editHole
+  (dialogFormTyle.value === 'create' ? addOver : editOver)(areaForm.value).then((res) => {
+    ElMessage.success('操作成功')
+    emits('refresh')
+    resetForm()
+    dialogFormVisible.value = false
+  })
+}
+// 确认
+const confirm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      if (valid) {
+        saveData()
+      }
+    }
+  })
+}
 // 地图选点
 const mapRef = ref()
 const selectMap = () => {
-  mapRef.value.initDialog()
+  mapRef.value.initDialog([areaForm.value.longitude, areaForm.value.latitude])
 }
 const confirmMap = (location: any) => {
   console.log(location, '选择的位置')
+  areaForm.value.longitude = location[0]
+  areaForm.value.latitude = location[1]
 }
+// 初始化对话框
+const initDialog = (type: string, row: any) => {
+  dialogFormVisible.value = true
+  dialogFormTyle.value = type
+  areaForm.value = JSON.parse(JSON.stringify(row))
+  if (type === 'create') {
+    resetForm()
+  }
+}
+defineExpose({
+  initDialog,
+})
 </script>
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="typeDict[dialogFormTyle]" append-to-body width="65%" top="10vh">
     <!-- 地图选点 -->
     <map-dialog ref="mapRef" @confirm="confirmMap" />
-    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
+    <el-form ref="dataFormRef" :class="[dialogFormTyle === 'detail' ? 'isDetail' : '']" :disabled="dialogFormTyle === 'detail'" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="序号">
-            <el-input v-model.trim="areaForm.couplingCode" type="text" />
+            <el-input v-model.trim="areaForm.serialNumber" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="隐患编号" disabled>
-            <el-input v-model.trim="areaForm.couplingTime" type="text" />
+          <el-form-item label="隐患编号" prop="hiddenDangerNumber">
+            <el-input v-model.trim="areaForm.hiddenDangerNumber" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="一级分类" disabled>
-            <el-input v-model.trim="areaForm.couplingTime" type="text" />
+          <el-form-item label="一级分类" prop="primaryClassification">
+            <el-input v-model.trim="areaForm.primaryClassification" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
-          <el-form-item label="二级分类">
-            <el-input v-model.trim="areaForm.couplingResult" type="text" />
+          <el-form-item label="二级分类" prop="secondaryClassification">
+            <el-input v-model.trim="areaForm.secondaryClassification" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="16">
-          <el-form-item label="隐患描述">
-            <el-input v-model.trim="areaForm.loglat" type="text" />
+          <el-form-item label="隐患描述" prop="hiddenDangerDescription">
+            <el-input v-model.trim="areaForm.hiddenDangerDescription" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
-          <el-form-item label="管网类型">
-            <el-input v-model.trim="areaForm.recognitionLevel" type="text" />
+          <el-form-item label="管网类型" prop="pipeNetworkType">
+            <el-input v-model.trim="areaForm.pipeNetworkType" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="管网、设备编码">
-            <el-input v-model.trim="areaForm.recognitionValue" type="text" />
+          <el-form-item label="管网、设备编码" prop="equipmentNumber">
+            <el-input v-model.trim="areaForm.equipmentNumber" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="所在区县">
-            <el-input v-model.trim="areaForm.recognitionValue" type="text" />
+          <el-form-item label="地点" prop="location">
+            <el-input v-model.trim="areaForm.location" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="24">
+      <!-- <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="所在街乡">
             <el-input v-model.trim="areaForm.holeLeve" type="text" />
@@ -111,19 +214,19 @@
             <el-input v-model.trim="areaForm.holeValue" type="text" />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="经度">
-            <el-input v-model.trim="areaForm.overstockLeve" type="text" />
+            <el-input v-model.trim="areaForm.longitude" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="纬度">
-            <el-input v-model.trim="areaForm.overstockValue" type="text" />
+            <el-input v-model.trim="areaForm.latitude" type="text" />
           </el-form-item>
         </el-col>
-        <el-col :span="4">
+        <el-col v-if="dialogFormTyle !== 'detail'" :span="4">
           <div style="margin-left: 15px;" class="icon-map" @click="selectMap">
             <el-tooltip
               class="box-item"
@@ -139,56 +242,63 @@
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="是否在小区内">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <!-- <el-input v-model.trim="areaForm.whetherItIsInTheCommunity" type="text" /> -->
+            <el-select v-model="areaForm.whetherItIsInTheCommunity" class="short-input" clearable style="width: 100%;">
+              <el-option v-for="item in whetherItIsInTheCommunity" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="小区内占压类型">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.occupyingType" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="小区名称">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.communityName" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
-          <el-form-item label="发现时间">
+          <el-form-item label="发现时间" prop="discoveryTime">
             <el-date-picker
-              v-model="value1"
+              v-model="areaForm.discoveryTime"
               type="datetime"
-              placeholder="发现时间"
               style="width: 100%;"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD HH:mm:ss"
             />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="隐患等级">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+          <el-form-item label="隐患等级" prop="hiddenDangerLevel">
+            <!-- <el-input v-model.trim="areaForm.gasValue" type="text" /> -->
+            <el-select v-model="areaForm.hiddenDangerLevel" class="short-input" clearable style="width: 100%;">
+              <el-option v-for="item in hiddenDangerLevel" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="管理责任企业">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+          <el-form-item label="管理责任企业" prop="responsibleManagementEnterprise">
+            <el-input v-model.trim="areaForm.responsibleManagementEnterprise" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
-          <el-form-item label="责任人">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+          <el-form-item label="责任人" prop="personInCharge">
+            <el-input v-model.trim="areaForm.personInCharge" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="计划消除时限">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+          <el-form-item label="计划消除时限" prop="plannedEliminationTimeLimit">
+            <el-input v-model.trim="areaForm.plannedEliminationTimeLimit" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="治理情况">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+          <el-form-item label="治理情况" prop="governanceSituation">
+            <el-input v-model.trim="areaForm.governanceSituation" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -196,178 +306,203 @@
         <el-col :span="8">
           <el-form-item label="消除时间">
             <el-date-picker
-              v-model="value1"
+              v-model="areaForm.eliminationTime"
               type="datetime"
-              placeholder="消除时间"
               style="width: 100%;"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD HH:mm:ss"
             />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="产权性质">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.propertyRightNature" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="备注">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.remark" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="占压企业/个人名称">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.occupiedEnterprisePersonalName" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压单位性质">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.occupationUnitProperty" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压物建成年代">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.dateOfConstructionOfTheOccupation" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="有无占压物建设批准文件">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <!-- <el-input v-model.trim="areaForm." type="text" /> -->
+            <el-select v-model="areaForm.anyApprovalDocumentsForTheConstruction" class="short-input" clearable style="width: 100%;">
+              <el-option label="有" value="1" />
+              <el-option label="无" value="0" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压物用途">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.useOfTheOccupation" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压物描述">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.descriptionOfTheOccupation" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="有无经常性人员活动">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.areThereRegularStaffActivities" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压物面积(m²)">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.areaOfOccupation" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="是否具备改移条件">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <!-- <el-input v-model.trim="areaForm.whetherThereAreConditionsForRelocation" type="text" /> -->
+            <el-select v-model="areaForm.whetherThereAreConditionsForRelocation" class="short-input" clearable style="width: 100%;">
+              <el-option v-for="item in whetherItIsInTheCommunity" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="年代">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.yearOfCommencementOfOperation" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="类别">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.yearOfUse" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="有无管线建设批准文件">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <!-- <el-input v-model.trim="areaForm.isThereAnyPipelineConstructionApprovalDocument" type="text" /> -->
+            <el-select v-model="areaForm.isThereAnyPipelineConstructionApprovalDocument" class="short-input" clearable style="width: 100%;">
+              <el-option label="有" value="1" />
+              <el-option label="无" value="0" />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="管线埋深(m)">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.pipelineDepth" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="管径">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.pipeDiameter" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="管线压力">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.linePressure" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="占压管线长度(m)">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.pipelineLength" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="是否纳入技改计划">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <!-- <el-input v-model.trim="areaForm.whetherItIsIncludedInTheTechnicalReformPlan" type="text" /> -->
+            <el-select v-model="areaForm.whetherItIsIncludedInTheTechnicalReformPlan" class="short-input" clearable style="width: 100%;">
+              <el-option v-for="item in whetherItIsInTheCommunity" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="技改项目号">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.technicalTransformationProjectNumber" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="防控措施">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.preventionAndControlMeasures" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="治理计划">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.governancePlan" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="限购或停气情况">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.purchaseRestrictionOrGasShutdown" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="改线工程名称">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.nameOfTheDiversionProject" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="改线工程编号">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.numberOfTheDiversionProject" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="改线进展统计">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.progressStatisticsOfTheDiversionProject" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="与区县对接联系人">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.contactPerson" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="特级占压分类情况">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.superOccupyingPressureClassification" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="cancel">
-          确认
-        </el-button>
+        <div v-if="dialogFormTyle !== 'detail'">
+          <el-button type="primary" @click="confirm(dataFormRef)">
+            确认
+          </el-button>
+          <el-button type="info" @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
@@ -389,3 +524,15 @@
 }
 </style>
 
+<style lang="scss" scoped>
+// 样式
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+</style>

diff --git a/src/api/common.ts b/src/api/common.ts
new file mode 100644
index 0000000..cdfffe6
--- /dev/null
+++ b/src/api/common.ts
@@ -0,0 +1,16 @@
+import request from './index'
+// 获取文件地址
+export function getFileUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
+// 上传文件
+export function uploadFile(data: FormData) {
+  return request({
+    url: 'minio/file/upload',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/page/database.ts b/src/api/page/database.ts
new file mode 100644
index 0000000..7715aa5
--- /dev/null
+++ b/src/api/page/database.ts
@@ -0,0 +1,62 @@
+/**
+ * 管线占压相关接口
+ */
+import request from '../index'
+// 列表查询
+export function getOverListPage(params: any) {
+  return request({
+    url: `/system/busPipeOverstock/listPage?offset=${params.offset}&limit=${params.limit}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 导出
+export function exporOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/export',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 删除
+export function batchDeleteOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/delete',
+    method: 'post',
+    data: params,
+  })
+}
+// 模板下载
+export function templateOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/template',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 导入
+export function importOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/import',
+    method: 'post',
+    data: params,
+  })
+}
+// 新建
+export function addOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/add',
+    method: 'post',
+    data: params,
+  })
+}
+// 编辑
+export function editOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/edit',
+    method: 'post',
+    data: params,
+  })
+}
diff --git a/src/api/page/undergroundCavity.TS b/src/api/page/undergroundCavity.TS
new file mode 100644
index 0000000..afd0c20
--- /dev/null
+++ b/src/api/page/undergroundCavity.TS
@@ -0,0 +1,70 @@
+/**
+ * 地下空洞相关接口
+ */
+import request from '../index'
+// 列表查询
+export function getHoleListPage(params: any) {
+  return request({
+    url: `/system/busHole/listPage?offset=${params.offset}&limit=${params.limit}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 新建
+export function addHole(params: any) {
+  return request({
+    url: '/system/busHole/add',
+    method: 'post',
+    data: params,
+  })
+}
+// 编辑
+export function editHole(params: any) {
+  return request({
+    url: '/system/busHole/edit',
+    method: 'post',
+    data: params,
+  })
+}
+// 详情
+export function detailHole(params: any) {
+  return request({
+    url: '/system/busHole/detail',
+    method: 'post',
+    data: params,
+  })
+}
+// 导出
+export function exportHole(params: any) {
+  return request({
+    url: '/system/busHole/export',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 删除
+export function batchDeleteHole(params: any) {
+  return request({
+    url: '/system/busHole/delete',
+    method: 'post',
+    data: params,
+  })
+}
+// 模板下载
+export function templateHole(params: any) {
+  return request({
+    url: '/system/busHole/template',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 导入
+export function importHole(params: any) {
+  return request({
+    url: '/system/busHole/import',
+    method: 'post',
+    data: params,
+  })
+}
diff --git a/src/views/main/database/detail.vue b/src/views/main/database/detail.vue
index 31d6a63..a798fc6 100644
--- a/src/views/main/database/detail.vue
+++ b/src/views/main/database/detail.vue
@@ -1,10 +1,10 @@
 <!-- 管线占压详情 -->
 <script lang="ts" setup name="GanDetail">
-import type { FormRules } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import mapDialog from './mapDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
-// import { getGasDetail } from '@/api/page/gas'
+import { addOver, editOver } from '@/api/page/database'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -14,93 +14,196 @@
   update: '编辑',
   detail: '详情',
 })
-const areaForm = ref({
+const areaForm = ref<{ [key: string]: string }>({
+  serialNumber: '', // 序号
+  hiddenDangerNumber: '', // 隐患标号
+  primaryClassification: '', // 一级分类
+  secondaryClassification: '', // 二级分类
+  hiddenDangerDescription: '', // 隐患描述
+  pipeNetworkType: '', // 管网类型
+  equipmentNumber: '', // 编码
+  location: '', // 地点
+  longitude: '', // 经度
+  latitude: '', // 纬度
+  whetherItIsInTheCommunity: '', // 是否在小区内
+  occupyingType: '', // 小区内占压类型
+  communityName: '', // 小区名称
+  discoveryTime: '', // 发现时间
+  hiddenDangerLevel: '', // 隐患等级
+  responsibleManagementEnterprise: '', // 责任管理企业
+  personInCharge: '', // 责任人
+  plannedEliminationTimeLimit: '', // 计划消除时限
+  governanceSituation: '', // 治理情况
+  eliminationTime: '', // 消除时间
+  propertyRightNature: '', // 产权性质
+  remark: '', // 备注
+  occupiedEnterprisePersonalName: '', // 占压企业/个人名称
+  occupationUnitProperty: '', // 占压单位性质
+  dateOfConstructionOfTheOccupation: '', // 占压物建成年份
+  anyApprovalDocumentsForTheConstruction: '', // 有无占压物批准文件
+  useOfTheOccupation: '', // 占压物用途
+  descriptionOfTheOccupation: '', // 占压物描述
+  areThereRegularStaffActivities: '', // 有无经常性人员活动
+  areaOfOccupation: '', // 占压物面积
+  whetherThereAreConditionsForRelocation: '', // 占压物面积
+  yearOfUse: '', // 年代类别
+  yearOfCommencementOfOperation: '', // 年份
+  isThereAnyPipelineConstructionApprovalDocument: '', // 有无建设批准文件
+  pipelineDepth: '', // 管线埋深
+  pipeDiameter: '', // 管径
+  linePressure: '', // 管线压力
+  pipelineLength: '', // 占压管线长度
+  whetherItIsIncludedInTheTechnicalReformPlan: '', // 是否纳入技改计划
+  technicalTransformationProjectNumber: '', // 技改项目号
+  preventionAndControlMeasures: '', // 防控措施
+  governancePlan: '', // 治理计划
+  purchaseRestrictionOrGasShutdown: '', // 限购或停气情况
+  nameOfTheDiversionProject: '', // 改线工程名称
+  numberOfTheDiversionProject: '', // 改线工程编号
+  progressStatisticsOfTheDiversionProject: '', // 改线进度统计
+  contactPerson: '', // 与区县对接联系人
+  superOccupyingPressureClassification: '', // 特级占压分类情况
 }) // 表单
 const rules: FormRules = {
+  hiddenDangerNumber: [{ required: true, message: '隐患编号必填', trigger: ['blur', 'change'] }],
+  primaryClassification: [{ required: true, message: '一级分类必填', trigger: ['blur', 'change'] }],
+  secondaryClassification: [{ required: true, message: '二级分类必填', trigger: ['blur', 'change'] }],
+  hiddenDangerDescription: [{ required: true, message: '隐患描述必填', trigger: ['blur', 'change'] }],
+  pipeNetworkType: [{ required: true, message: '管网类型必填', trigger: ['blur', 'change'] }],
+  equipmentNumber: [{ required: true, message: '编码必填', trigger: ['blur', 'change'] }],
+  location: [{ required: true, message: '地点必填', trigger: ['blur', 'change'] }],
+  discoveryTime: [{ required: true, message: '发现时间必选', trigger: ['blur', 'change'] }],
+  hiddenDangerLevel: [{ required: true, message: '隐患等级必选', trigger: ['blur', 'change'] }],
+  responsibleManagementEnterprise: [{ required: true, message: '责任管理企业必填', trigger: ['blur', 'change'] }],
+  personInCharge: [{ required: true, message: '责任人必填', trigger: ['blur', 'change'] }],
+  governanceSituation: [{ required: true, message: '治理情况必填', trigger: ['blur', 'change'] }],
 } // 前端校验规则
-// 获取处置原因
-const cancelReasonList = ref<{ name: string;value: string;id: string }[]>()
+// 获取字典
+const whetherItIsInTheCommunity = ref<{ name: string;value: string;id: string }[]>() // 是否在小区内
+const hiddenDangerLevel = ref<{ name: string;value: string;id: string }[]>() // 隐患等级
 const fetchDict = () => {
-  getDictByCode('alarmHandlerReason').then((res) => {
-    cancelReasonList.value = res.data
+  getDictByCode('isAlarm').then((res) => {
+    whetherItIsInTheCommunity.value = res.data
+  })
+  getDictByCode('hiddenDangerLevel').then((res) => {
+    hiddenDangerLevel.value = res.data
   })
 }
 fetchDict()
-// 初始化对话框
-const initDialog = (type: string, row: any) => {
-  dialogFormVisible.value = true
-  dialogFormTyle.value = type
-  areaForm.value = row
+
+// 重置
+const resetForm = () => {
+  areaForm.value
+  for (const i in areaForm.value) {
+    areaForm.value[i] = ''
+  }
+  nextTick(() => {
+    dataFormRef.value?.clearValidate()
+  })
 }
-defineExpose({
-  initDialog,
-})
 // 取消
 const cancel = () => {
+  resetForm()
   dialogFormVisible.value = false
 }
+// 保存数据
+const saveData = () => {
+  // addHole
+  // editHole
+  (dialogFormTyle.value === 'create' ? addOver : editOver)(areaForm.value).then((res) => {
+    ElMessage.success('操作成功')
+    emits('refresh')
+    resetForm()
+    dialogFormVisible.value = false
+  })
+}
+// 确认
+const confirm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      if (valid) {
+        saveData()
+      }
+    }
+  })
+}
 // 地图选点
 const mapRef = ref()
 const selectMap = () => {
-  mapRef.value.initDialog()
+  mapRef.value.initDialog([areaForm.value.longitude, areaForm.value.latitude])
 }
 const confirmMap = (location: any) => {
   console.log(location, '选择的位置')
+  areaForm.value.longitude = location[0]
+  areaForm.value.latitude = location[1]
 }
+// 初始化对话框
+const initDialog = (type: string, row: any) => {
+  dialogFormVisible.value = true
+  dialogFormTyle.value = type
+  areaForm.value = JSON.parse(JSON.stringify(row))
+  if (type === 'create') {
+    resetForm()
+  }
+}
+defineExpose({
+  initDialog,
+})
 </script>
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="typeDict[dialogFormTyle]" append-to-body width="65%" top="10vh">
     <!-- 地图选点 -->
     <map-dialog ref="mapRef" @confirm="confirmMap" />
-    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
+    <el-form ref="dataFormRef" :class="[dialogFormTyle === 'detail' ? 'isDetail' : '']" :disabled="dialogFormTyle === 'detail'" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="序号">
-            <el-input v-model.trim="areaForm.couplingCode" type="text" />
+            <el-input v-model.trim="areaForm.serialNumber" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="隐患编号" disabled>
-            <el-input v-model.trim="areaForm.couplingTime" type="text" />
+          <el-form-item label="隐患编号" prop="hiddenDangerNumber">
+            <el-input v-model.trim="areaForm.hiddenDangerNumber" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="一级分类" disabled>
-            <el-input v-model.trim="areaForm.couplingTime" type="text" />
+          <el-form-item label="一级分类" prop="primaryClassification">
+            <el-input v-model.trim="areaForm.primaryClassification" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
-          <el-form-item label="二级分类">
-            <el-input v-model.trim="areaForm.couplingResult" type="text" />
+          <el-form-item label="二级分类" prop="secondaryClassification">
+            <el-input v-model.trim="areaForm.secondaryClassification" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="16">
-          <el-form-item label="隐患描述">
-            <el-input v-model.trim="areaForm.loglat" type="text" />
+          <el-form-item label="隐患描述" prop="hiddenDangerDescription">
+            <el-input v-model.trim="areaForm.hiddenDangerDescription" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
-          <el-form-item label="管网类型">
-            <el-input v-model.trim="areaForm.recognitionLevel" type="text" />
+          <el-form-item label="管网类型" prop="pipeNetworkType">
+            <el-input v-model.trim="areaForm.pipeNetworkType" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="管网、设备编码">
-            <el-input v-model.trim="areaForm.recognitionValue" type="text" />
+          <el-form-item label="管网、设备编码" prop="equipmentNumber">
+            <el-input v-model.trim="areaForm.equipmentNumber" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="所在区县">
-            <el-input v-model.trim="areaForm.recognitionValue" type="text" />
+          <el-form-item label="地点" prop="location">
+            <el-input v-model.trim="areaForm.location" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="24">
+      <!-- <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="所在街乡">
             <el-input v-model.trim="areaForm.holeLeve" type="text" />
@@ -111,19 +214,19 @@
             <el-input v-model.trim="areaForm.holeValue" type="text" />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="经度">
-            <el-input v-model.trim="areaForm.overstockLeve" type="text" />
+            <el-input v-model.trim="areaForm.longitude" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="纬度">
-            <el-input v-model.trim="areaForm.overstockValue" type="text" />
+            <el-input v-model.trim="areaForm.latitude" type="text" />
           </el-form-item>
         </el-col>
-        <el-col :span="4">
+        <el-col v-if="dialogFormTyle !== 'detail'" :span="4">
           <div style="margin-left: 15px;" class="icon-map" @click="selectMap">
             <el-tooltip
               class="box-item"
@@ -139,56 +242,63 @@
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="是否在小区内">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <!-- <el-input v-model.trim="areaForm.whetherItIsInTheCommunity" type="text" /> -->
+            <el-select v-model="areaForm.whetherItIsInTheCommunity" class="short-input" clearable style="width: 100%;">
+              <el-option v-for="item in whetherItIsInTheCommunity" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="小区内占压类型">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.occupyingType" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="小区名称">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.communityName" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
-          <el-form-item label="发现时间">
+          <el-form-item label="发现时间" prop="discoveryTime">
             <el-date-picker
-              v-model="value1"
+              v-model="areaForm.discoveryTime"
               type="datetime"
-              placeholder="发现时间"
               style="width: 100%;"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD HH:mm:ss"
             />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="隐患等级">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+          <el-form-item label="隐患等级" prop="hiddenDangerLevel">
+            <!-- <el-input v-model.trim="areaForm.gasValue" type="text" /> -->
+            <el-select v-model="areaForm.hiddenDangerLevel" class="short-input" clearable style="width: 100%;">
+              <el-option v-for="item in hiddenDangerLevel" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="管理责任企业">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+          <el-form-item label="管理责任企业" prop="responsibleManagementEnterprise">
+            <el-input v-model.trim="areaForm.responsibleManagementEnterprise" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
-          <el-form-item label="责任人">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+          <el-form-item label="责任人" prop="personInCharge">
+            <el-input v-model.trim="areaForm.personInCharge" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="计划消除时限">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+          <el-form-item label="计划消除时限" prop="plannedEliminationTimeLimit">
+            <el-input v-model.trim="areaForm.plannedEliminationTimeLimit" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="治理情况">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+          <el-form-item label="治理情况" prop="governanceSituation">
+            <el-input v-model.trim="areaForm.governanceSituation" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -196,178 +306,203 @@
         <el-col :span="8">
           <el-form-item label="消除时间">
             <el-date-picker
-              v-model="value1"
+              v-model="areaForm.eliminationTime"
               type="datetime"
-              placeholder="消除时间"
               style="width: 100%;"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD HH:mm:ss"
             />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="产权性质">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.propertyRightNature" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="备注">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.remark" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="占压企业/个人名称">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.occupiedEnterprisePersonalName" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压单位性质">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.occupationUnitProperty" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压物建成年代">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.dateOfConstructionOfTheOccupation" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="有无占压物建设批准文件">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <!-- <el-input v-model.trim="areaForm." type="text" /> -->
+            <el-select v-model="areaForm.anyApprovalDocumentsForTheConstruction" class="short-input" clearable style="width: 100%;">
+              <el-option label="有" value="1" />
+              <el-option label="无" value="0" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压物用途">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.useOfTheOccupation" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压物描述">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.descriptionOfTheOccupation" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="有无经常性人员活动">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.areThereRegularStaffActivities" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压物面积(m²)">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.areaOfOccupation" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="是否具备改移条件">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <!-- <el-input v-model.trim="areaForm.whetherThereAreConditionsForRelocation" type="text" /> -->
+            <el-select v-model="areaForm.whetherThereAreConditionsForRelocation" class="short-input" clearable style="width: 100%;">
+              <el-option v-for="item in whetherItIsInTheCommunity" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="年代">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.yearOfCommencementOfOperation" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="类别">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.yearOfUse" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="有无管线建设批准文件">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <!-- <el-input v-model.trim="areaForm.isThereAnyPipelineConstructionApprovalDocument" type="text" /> -->
+            <el-select v-model="areaForm.isThereAnyPipelineConstructionApprovalDocument" class="short-input" clearable style="width: 100%;">
+              <el-option label="有" value="1" />
+              <el-option label="无" value="0" />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="管线埋深(m)">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.pipelineDepth" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="管径">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.pipeDiameter" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="管线压力">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.linePressure" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="占压管线长度(m)">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.pipelineLength" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="是否纳入技改计划">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <!-- <el-input v-model.trim="areaForm.whetherItIsIncludedInTheTechnicalReformPlan" type="text" /> -->
+            <el-select v-model="areaForm.whetherItIsIncludedInTheTechnicalReformPlan" class="short-input" clearable style="width: 100%;">
+              <el-option v-for="item in whetherItIsInTheCommunity" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="技改项目号">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.technicalTransformationProjectNumber" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="防控措施">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.preventionAndControlMeasures" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="治理计划">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.governancePlan" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="限购或停气情况">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.purchaseRestrictionOrGasShutdown" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="改线工程名称">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.nameOfTheDiversionProject" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="改线工程编号">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.numberOfTheDiversionProject" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="改线进展统计">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.progressStatisticsOfTheDiversionProject" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="与区县对接联系人">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.contactPerson" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="特级占压分类情况">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.superOccupyingPressureClassification" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="cancel">
-          确认
-        </el-button>
+        <div v-if="dialogFormTyle !== 'detail'">
+          <el-button type="primary" @click="confirm(dataFormRef)">
+            确认
+          </el-button>
+          <el-button type="info" @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
@@ -389,3 +524,15 @@
 }
 </style>
 
+<style lang="scss" scoped>
+// 样式
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/main/database/index.vue b/src/views/main/database/index.vue
index eece6ad..231b94c 100644
--- a/src/views/main/database/index.vue
+++ b/src/views/main/database/index.vue
@@ -1,20 +1,25 @@
 <!-- 管线占压数据管理 -->
 <script name="DatabaseManage" setup lang="ts">
-import { getCurrentInstance, onMounted, ref, watch } from 'vue'
-import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { DateModelType } from 'element-plus'
 import detailDialog from './detail.vue'
 import type { dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { batchDeleteOver, exporOver, getOverListPage, importOver, templateOver } from '@/api/page/database'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 
 // 查询条件
 const listQuery = ref({
-  recognitionCode: '', // 第三方code
+  hiddenDangerNumber: '', // 隐患编号
+  primaryClassification: '', // 一级分类
+  secondaryClassification: '', // 二级分类
+  hiddenDangerDescription: '', // 隐患描述
+  hiddenDangerLevel: '', // 隐患等级
+  responsibleManagementEnterprise: '', // 管理责任企业
+  discoveryTime: '', // 发现时间
+  governanceSituation: '', // 治理
   offset: 1,
   limit: 20,
 })
@@ -22,36 +27,22 @@
 const loadingTable = ref(false) // 表格loading
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '序号', value: 'recognitionCode', align: 'center', width: '160' },
-  { text: '隐患编号', value: 'recognitionType', align: 'center' },
-  { text: '一级分类', value: 'recognitionTime', align: 'center' },
-  { text: '二级分类', value: 'loglat', align: 'center' },
-  { text: '地点', value: 'position', align: 'center' },
-  { text: '发现时间', value: 'recognitionPrecision', align: 'center' },
-  { text: '隐患等级', value: 'recognitionLevel', align: 'center' },
-  { text: '管理责任企业', value: 'taskName', align: 'center' },
-  { text: '责任人', value: 'taskName', align: 'center' },
-  { text: '治理情况', value: 'taskName', align: 'center' },
-  { text: '消除时间', value: 'taskName', align: 'center' },
+  { text: '序号', value: 'serialNumber', align: 'center' },
+  { text: '隐患编号', value: 'hiddenDangerNumber', align: 'center' },
+  { text: '一级分类', value: 'primaryClassification', align: 'center' },
+  { text: '二级分类', value: 'secondaryClassification', align: 'center' },
+  { text: '地点', value: 'location', align: 'center' },
+  { text: '发现时间', value: 'discoveryTime', align: 'center' },
+  { text: '隐患等级', value: 'hiddenDangerLevel', align: 'center' },
+  { text: '管理责任企业', value: 'responsibleManagementEnterprise', align: 'center' },
+  { text: '责任人', value: 'personInCharge', align: 'center' },
+  { text: '治理情况', value: 'governanceSituation', align: 'center' },
+  { text: '消除时间', value: 'eliminationTime', align: 'center' },
 ])
 const list = ref([]) // 表格数据
-// 筛选时间段数据
-const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
-// 时间变更
-watch(dateRange, (val) => {
-  if (val) {
-    listQuery.value.beginDate = `${val[0]}`
-    listQuery.value.endDate = `${val[1]}`
-  }
-  else {
-    listQuery.value.beginDate = ''
-    listQuery.value.endDate = ''
-  }
-})
-
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -59,15 +50,19 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getIdentifyListPage(listQuery.value).then((res) => {
-  //   console.log(res.data, '第三方')
-  //   list.value = res.data.rows
-  //   total.value = parseInt(res.data.total)
-  //   loadingTable.value = false
-  // }).catch(() => {
-  list.value = [{}]
-  loadingTable.value = false
-  // })
+  getOverListPage(listQuery.value).then((res) => {
+    console.log(res.data, '管线占压')
+    list.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        eliminationTime: item.eliminationTime ? item.eliminationTime : '/',
+      }
+    })
+    total.value = parseInt(res.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 // 搜索
 const searchList = () => {
@@ -77,17 +72,17 @@
 // 重置
 const reset = () => {
   listQuery.value = {
-    alarmCode: '', // 报警编号
-    beginDate: '', // 报警开始时间
-    endDate: '', // 报警结束时间
-    alarmType: '1',
-    taskName: '', // 巡检任务名称
-    // position: '', // 报警位置
-    alarmStatus: '', // 报警状态
+    hiddenDangerNumber: '', // 隐患编号
+    primaryClassification: '', // 一级分类
+    secondaryClassification: '', // 二级分类
+    hiddenDangerDescription: '', // 隐患描述
+    hiddenDangerLevel: '', // 隐患等级
+    responsibleManagementEnterprise: '', // 管理责任企业
+    discoveryTime: '', // 发现时间
+    governanceSituation: '', // 治理
     offset: 1,
     limit: 20,
   }
-  dateRange.value = ['', ''] // 时间清空
   fetchData(true)
 }
 
@@ -98,19 +93,72 @@
 
 // 导出
 const exportList = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择需要导出的数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (list.value.length > 0) {
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
+  exportOver({ ids: checkoutList.value }).then((res) => {
+    exportFile(res.data, '管线占压数据列表.xlsx')
+    loading.close()
+  }).catch(() => {
+    loading.close()
+  })
 }
-
+// 导入
+const importRef = ref()
+const importList = () => {
+  importRef.value.click()
+}
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('file', event.target.files[0])
+    // fd.append('equipmentType', $props.equipmentType)
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    importOver(fd).then((res) => {
+      // 清空上传缓存
+      importRef.value.value = ''
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+        loading.close()
+        fetchData(true)
+      }
+      else {
+        loading.close()
+      }
+    }).catch(() => {
+      // 清空上传缓存
+      importRef.value.value = ''
+      loading.close()
+    })
+  }
+}
+// 删除
+const deleteList = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择需要删除的数据')
+    return
+  }
+  batchDeleteOver({ ids: checkoutList.value }).then((res) => {
+    ElMessage.success('操作成功')
+    fetchData(true)
+  })
+}
+// 模板下载
+const templateDownload = () => {
+  templateHole({}).then((res) => {
+    exportFile(res.data, '地下空洞模板')
+  })
+}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -127,18 +175,17 @@
 const handler = (type: string, row: any) => {
   handlerRef.value.initDialog(type, row)
 }
-// 处置报警
-const alarmRef = ref()
-const handlerAlarm = (row: IList) => {
-  alarmRef.value.initDialog(row)
-}
-const alarmStatusMap = ref<dictType[]>([]) // 报警状态
 
+const hiddenDangerLevelList = ref<dictType[]>([]) // 隐患等级
+const governanceSituationList = ref<dictType[]>([]) // 是否治理
 // 查询字典
 const getDict = async () => {
   // 巡检状态
-  getDictByCode('alarmStatus').then((response) => {
-    alarmStatusMap.value = response.data
+  getDictByCode('hiddenDangerLevel').then((response) => {
+    hiddenDangerLevelList.value = response.data
+  })
+  getDictByCode('isAlarm').then((response) => {
+    governanceSituationList.value = response.data
   })
 }
 
@@ -152,11 +199,11 @@
   <!-- 布局 -->
   <app-container>
     <!-- 编辑操作 -->
-    <detail-dialog ref="handlerRef" />
+    <detail-dialog ref="handlerRef" @refresh="searchList" />
     <search-area :need-clear="true" @search="searchList" @clear="reset">
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.hiddenDangerNumber"
           placeholder="隐患编号"
           class="short-input"
           clearable
@@ -164,7 +211,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.primaryClassification"
           placeholder="一级分类"
           class="short-input"
           clearable
@@ -172,7 +219,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.secondaryClassification"
           placeholder="二级分类"
           class="short-input"
           clearable
@@ -180,20 +227,20 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.hiddenDangerDescription"
           placeholder="隐患描述"
           class="short-input"
           clearable
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.alarmStatus" class="short-input" placeholder="隐患等级" clearable>
-          <el-option v-for="item in alarmStatusMap" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.hiddenDangerLevel" class="short-input" placeholder="隐患等级" clearable>
+          <el-option v-for="item in hiddenDangerLevelList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.responsibleManagementEnterprise"
           placeholder="管理责任公司"
           class="short-input"
           clearable
@@ -201,24 +248,27 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.value1"
+          v-model="listQuery.discoveryTime"
           type="date"
           placeholder="发现时间"
           style="width: 100%;"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD HH:mm:ss"
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.alarmStatus" class="short-input" placeholder="是否进行治理" clearable>
-          <el-option v-for="item in alarmStatusMap" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.governanceSituation" class="short-input" placeholder="是否进行治理" clearable>
+          <el-option v-for="item in governanceSituationList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新增" type="primary" @click="handler('create', {})" />
-        <icon-button icon="icon-delete" title="删除" type="primary" />
-        <icon-button icon="icon-template" title="模板下载" type="primary" />
-        <icon-button icon="icon-import" title="导入" type="primary" />
+        <icon-button icon="icon-delete" title="删除" type="primary" @click="deleteList" />
+        <icon-button icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
+        <icon-button icon="icon-import" title="导入" type="primary" @click="importList" />
+        <input ref="importRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
       </template>
       <normal-table
@@ -226,7 +276,7 @@
         is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="#" width="55" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>

diff --git a/src/api/common.ts b/src/api/common.ts
new file mode 100644
index 0000000..cdfffe6
--- /dev/null
+++ b/src/api/common.ts
@@ -0,0 +1,16 @@
+import request from './index'
+// 获取文件地址
+export function getFileUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
+// 上传文件
+export function uploadFile(data: FormData) {
+  return request({
+    url: 'minio/file/upload',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/page/database.ts b/src/api/page/database.ts
new file mode 100644
index 0000000..7715aa5
--- /dev/null
+++ b/src/api/page/database.ts
@@ -0,0 +1,62 @@
+/**
+ * 管线占压相关接口
+ */
+import request from '../index'
+// 列表查询
+export function getOverListPage(params: any) {
+  return request({
+    url: `/system/busPipeOverstock/listPage?offset=${params.offset}&limit=${params.limit}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 导出
+export function exporOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/export',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 删除
+export function batchDeleteOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/delete',
+    method: 'post',
+    data: params,
+  })
+}
+// 模板下载
+export function templateOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/template',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 导入
+export function importOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/import',
+    method: 'post',
+    data: params,
+  })
+}
+// 新建
+export function addOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/add',
+    method: 'post',
+    data: params,
+  })
+}
+// 编辑
+export function editOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/edit',
+    method: 'post',
+    data: params,
+  })
+}
diff --git a/src/api/page/undergroundCavity.TS b/src/api/page/undergroundCavity.TS
new file mode 100644
index 0000000..afd0c20
--- /dev/null
+++ b/src/api/page/undergroundCavity.TS
@@ -0,0 +1,70 @@
+/**
+ * 地下空洞相关接口
+ */
+import request from '../index'
+// 列表查询
+export function getHoleListPage(params: any) {
+  return request({
+    url: `/system/busHole/listPage?offset=${params.offset}&limit=${params.limit}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 新建
+export function addHole(params: any) {
+  return request({
+    url: '/system/busHole/add',
+    method: 'post',
+    data: params,
+  })
+}
+// 编辑
+export function editHole(params: any) {
+  return request({
+    url: '/system/busHole/edit',
+    method: 'post',
+    data: params,
+  })
+}
+// 详情
+export function detailHole(params: any) {
+  return request({
+    url: '/system/busHole/detail',
+    method: 'post',
+    data: params,
+  })
+}
+// 导出
+export function exportHole(params: any) {
+  return request({
+    url: '/system/busHole/export',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 删除
+export function batchDeleteHole(params: any) {
+  return request({
+    url: '/system/busHole/delete',
+    method: 'post',
+    data: params,
+  })
+}
+// 模板下载
+export function templateHole(params: any) {
+  return request({
+    url: '/system/busHole/template',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 导入
+export function importHole(params: any) {
+  return request({
+    url: '/system/busHole/import',
+    method: 'post',
+    data: params,
+  })
+}
diff --git a/src/views/main/database/detail.vue b/src/views/main/database/detail.vue
index 31d6a63..a798fc6 100644
--- a/src/views/main/database/detail.vue
+++ b/src/views/main/database/detail.vue
@@ -1,10 +1,10 @@
 <!-- 管线占压详情 -->
 <script lang="ts" setup name="GanDetail">
-import type { FormRules } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import mapDialog from './mapDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
-// import { getGasDetail } from '@/api/page/gas'
+import { addOver, editOver } from '@/api/page/database'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -14,93 +14,196 @@
   update: '编辑',
   detail: '详情',
 })
-const areaForm = ref({
+const areaForm = ref<{ [key: string]: string }>({
+  serialNumber: '', // 序号
+  hiddenDangerNumber: '', // 隐患标号
+  primaryClassification: '', // 一级分类
+  secondaryClassification: '', // 二级分类
+  hiddenDangerDescription: '', // 隐患描述
+  pipeNetworkType: '', // 管网类型
+  equipmentNumber: '', // 编码
+  location: '', // 地点
+  longitude: '', // 经度
+  latitude: '', // 纬度
+  whetherItIsInTheCommunity: '', // 是否在小区内
+  occupyingType: '', // 小区内占压类型
+  communityName: '', // 小区名称
+  discoveryTime: '', // 发现时间
+  hiddenDangerLevel: '', // 隐患等级
+  responsibleManagementEnterprise: '', // 责任管理企业
+  personInCharge: '', // 责任人
+  plannedEliminationTimeLimit: '', // 计划消除时限
+  governanceSituation: '', // 治理情况
+  eliminationTime: '', // 消除时间
+  propertyRightNature: '', // 产权性质
+  remark: '', // 备注
+  occupiedEnterprisePersonalName: '', // 占压企业/个人名称
+  occupationUnitProperty: '', // 占压单位性质
+  dateOfConstructionOfTheOccupation: '', // 占压物建成年份
+  anyApprovalDocumentsForTheConstruction: '', // 有无占压物批准文件
+  useOfTheOccupation: '', // 占压物用途
+  descriptionOfTheOccupation: '', // 占压物描述
+  areThereRegularStaffActivities: '', // 有无经常性人员活动
+  areaOfOccupation: '', // 占压物面积
+  whetherThereAreConditionsForRelocation: '', // 占压物面积
+  yearOfUse: '', // 年代类别
+  yearOfCommencementOfOperation: '', // 年份
+  isThereAnyPipelineConstructionApprovalDocument: '', // 有无建设批准文件
+  pipelineDepth: '', // 管线埋深
+  pipeDiameter: '', // 管径
+  linePressure: '', // 管线压力
+  pipelineLength: '', // 占压管线长度
+  whetherItIsIncludedInTheTechnicalReformPlan: '', // 是否纳入技改计划
+  technicalTransformationProjectNumber: '', // 技改项目号
+  preventionAndControlMeasures: '', // 防控措施
+  governancePlan: '', // 治理计划
+  purchaseRestrictionOrGasShutdown: '', // 限购或停气情况
+  nameOfTheDiversionProject: '', // 改线工程名称
+  numberOfTheDiversionProject: '', // 改线工程编号
+  progressStatisticsOfTheDiversionProject: '', // 改线进度统计
+  contactPerson: '', // 与区县对接联系人
+  superOccupyingPressureClassification: '', // 特级占压分类情况
 }) // 表单
 const rules: FormRules = {
+  hiddenDangerNumber: [{ required: true, message: '隐患编号必填', trigger: ['blur', 'change'] }],
+  primaryClassification: [{ required: true, message: '一级分类必填', trigger: ['blur', 'change'] }],
+  secondaryClassification: [{ required: true, message: '二级分类必填', trigger: ['blur', 'change'] }],
+  hiddenDangerDescription: [{ required: true, message: '隐患描述必填', trigger: ['blur', 'change'] }],
+  pipeNetworkType: [{ required: true, message: '管网类型必填', trigger: ['blur', 'change'] }],
+  equipmentNumber: [{ required: true, message: '编码必填', trigger: ['blur', 'change'] }],
+  location: [{ required: true, message: '地点必填', trigger: ['blur', 'change'] }],
+  discoveryTime: [{ required: true, message: '发现时间必选', trigger: ['blur', 'change'] }],
+  hiddenDangerLevel: [{ required: true, message: '隐患等级必选', trigger: ['blur', 'change'] }],
+  responsibleManagementEnterprise: [{ required: true, message: '责任管理企业必填', trigger: ['blur', 'change'] }],
+  personInCharge: [{ required: true, message: '责任人必填', trigger: ['blur', 'change'] }],
+  governanceSituation: [{ required: true, message: '治理情况必填', trigger: ['blur', 'change'] }],
 } // 前端校验规则
-// 获取处置原因
-const cancelReasonList = ref<{ name: string;value: string;id: string }[]>()
+// 获取字典
+const whetherItIsInTheCommunity = ref<{ name: string;value: string;id: string }[]>() // 是否在小区内
+const hiddenDangerLevel = ref<{ name: string;value: string;id: string }[]>() // 隐患等级
 const fetchDict = () => {
-  getDictByCode('alarmHandlerReason').then((res) => {
-    cancelReasonList.value = res.data
+  getDictByCode('isAlarm').then((res) => {
+    whetherItIsInTheCommunity.value = res.data
+  })
+  getDictByCode('hiddenDangerLevel').then((res) => {
+    hiddenDangerLevel.value = res.data
   })
 }
 fetchDict()
-// 初始化对话框
-const initDialog = (type: string, row: any) => {
-  dialogFormVisible.value = true
-  dialogFormTyle.value = type
-  areaForm.value = row
+
+// 重置
+const resetForm = () => {
+  areaForm.value
+  for (const i in areaForm.value) {
+    areaForm.value[i] = ''
+  }
+  nextTick(() => {
+    dataFormRef.value?.clearValidate()
+  })
 }
-defineExpose({
-  initDialog,
-})
 // 取消
 const cancel = () => {
+  resetForm()
   dialogFormVisible.value = false
 }
+// 保存数据
+const saveData = () => {
+  // addHole
+  // editHole
+  (dialogFormTyle.value === 'create' ? addOver : editOver)(areaForm.value).then((res) => {
+    ElMessage.success('操作成功')
+    emits('refresh')
+    resetForm()
+    dialogFormVisible.value = false
+  })
+}
+// 确认
+const confirm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      if (valid) {
+        saveData()
+      }
+    }
+  })
+}
 // 地图选点
 const mapRef = ref()
 const selectMap = () => {
-  mapRef.value.initDialog()
+  mapRef.value.initDialog([areaForm.value.longitude, areaForm.value.latitude])
 }
 const confirmMap = (location: any) => {
   console.log(location, '选择的位置')
+  areaForm.value.longitude = location[0]
+  areaForm.value.latitude = location[1]
 }
+// 初始化对话框
+const initDialog = (type: string, row: any) => {
+  dialogFormVisible.value = true
+  dialogFormTyle.value = type
+  areaForm.value = JSON.parse(JSON.stringify(row))
+  if (type === 'create') {
+    resetForm()
+  }
+}
+defineExpose({
+  initDialog,
+})
 </script>
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="typeDict[dialogFormTyle]" append-to-body width="65%" top="10vh">
     <!-- 地图选点 -->
     <map-dialog ref="mapRef" @confirm="confirmMap" />
-    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
+    <el-form ref="dataFormRef" :class="[dialogFormTyle === 'detail' ? 'isDetail' : '']" :disabled="dialogFormTyle === 'detail'" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="序号">
-            <el-input v-model.trim="areaForm.couplingCode" type="text" />
+            <el-input v-model.trim="areaForm.serialNumber" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="隐患编号" disabled>
-            <el-input v-model.trim="areaForm.couplingTime" type="text" />
+          <el-form-item label="隐患编号" prop="hiddenDangerNumber">
+            <el-input v-model.trim="areaForm.hiddenDangerNumber" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="一级分类" disabled>
-            <el-input v-model.trim="areaForm.couplingTime" type="text" />
+          <el-form-item label="一级分类" prop="primaryClassification">
+            <el-input v-model.trim="areaForm.primaryClassification" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
-          <el-form-item label="二级分类">
-            <el-input v-model.trim="areaForm.couplingResult" type="text" />
+          <el-form-item label="二级分类" prop="secondaryClassification">
+            <el-input v-model.trim="areaForm.secondaryClassification" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="16">
-          <el-form-item label="隐患描述">
-            <el-input v-model.trim="areaForm.loglat" type="text" />
+          <el-form-item label="隐患描述" prop="hiddenDangerDescription">
+            <el-input v-model.trim="areaForm.hiddenDangerDescription" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
-          <el-form-item label="管网类型">
-            <el-input v-model.trim="areaForm.recognitionLevel" type="text" />
+          <el-form-item label="管网类型" prop="pipeNetworkType">
+            <el-input v-model.trim="areaForm.pipeNetworkType" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="管网、设备编码">
-            <el-input v-model.trim="areaForm.recognitionValue" type="text" />
+          <el-form-item label="管网、设备编码" prop="equipmentNumber">
+            <el-input v-model.trim="areaForm.equipmentNumber" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="所在区县">
-            <el-input v-model.trim="areaForm.recognitionValue" type="text" />
+          <el-form-item label="地点" prop="location">
+            <el-input v-model.trim="areaForm.location" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="24">
+      <!-- <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="所在街乡">
             <el-input v-model.trim="areaForm.holeLeve" type="text" />
@@ -111,19 +214,19 @@
             <el-input v-model.trim="areaForm.holeValue" type="text" />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="经度">
-            <el-input v-model.trim="areaForm.overstockLeve" type="text" />
+            <el-input v-model.trim="areaForm.longitude" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="纬度">
-            <el-input v-model.trim="areaForm.overstockValue" type="text" />
+            <el-input v-model.trim="areaForm.latitude" type="text" />
           </el-form-item>
         </el-col>
-        <el-col :span="4">
+        <el-col v-if="dialogFormTyle !== 'detail'" :span="4">
           <div style="margin-left: 15px;" class="icon-map" @click="selectMap">
             <el-tooltip
               class="box-item"
@@ -139,56 +242,63 @@
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="是否在小区内">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <!-- <el-input v-model.trim="areaForm.whetherItIsInTheCommunity" type="text" /> -->
+            <el-select v-model="areaForm.whetherItIsInTheCommunity" class="short-input" clearable style="width: 100%;">
+              <el-option v-for="item in whetherItIsInTheCommunity" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="小区内占压类型">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.occupyingType" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="小区名称">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.communityName" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
-          <el-form-item label="发现时间">
+          <el-form-item label="发现时间" prop="discoveryTime">
             <el-date-picker
-              v-model="value1"
+              v-model="areaForm.discoveryTime"
               type="datetime"
-              placeholder="发现时间"
               style="width: 100%;"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD HH:mm:ss"
             />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="隐患等级">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+          <el-form-item label="隐患等级" prop="hiddenDangerLevel">
+            <!-- <el-input v-model.trim="areaForm.gasValue" type="text" /> -->
+            <el-select v-model="areaForm.hiddenDangerLevel" class="short-input" clearable style="width: 100%;">
+              <el-option v-for="item in hiddenDangerLevel" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="管理责任企业">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+          <el-form-item label="管理责任企业" prop="responsibleManagementEnterprise">
+            <el-input v-model.trim="areaForm.responsibleManagementEnterprise" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
-          <el-form-item label="责任人">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+          <el-form-item label="责任人" prop="personInCharge">
+            <el-input v-model.trim="areaForm.personInCharge" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="计划消除时限">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+          <el-form-item label="计划消除时限" prop="plannedEliminationTimeLimit">
+            <el-input v-model.trim="areaForm.plannedEliminationTimeLimit" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="治理情况">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+          <el-form-item label="治理情况" prop="governanceSituation">
+            <el-input v-model.trim="areaForm.governanceSituation" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -196,178 +306,203 @@
         <el-col :span="8">
           <el-form-item label="消除时间">
             <el-date-picker
-              v-model="value1"
+              v-model="areaForm.eliminationTime"
               type="datetime"
-              placeholder="消除时间"
               style="width: 100%;"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD HH:mm:ss"
             />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="产权性质">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.propertyRightNature" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="备注">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.remark" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="占压企业/个人名称">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.occupiedEnterprisePersonalName" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压单位性质">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.occupationUnitProperty" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压物建成年代">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.dateOfConstructionOfTheOccupation" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="有无占压物建设批准文件">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <!-- <el-input v-model.trim="areaForm." type="text" /> -->
+            <el-select v-model="areaForm.anyApprovalDocumentsForTheConstruction" class="short-input" clearable style="width: 100%;">
+              <el-option label="有" value="1" />
+              <el-option label="无" value="0" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压物用途">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.useOfTheOccupation" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压物描述">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.descriptionOfTheOccupation" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="有无经常性人员活动">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.areThereRegularStaffActivities" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压物面积(m²)">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.areaOfOccupation" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="是否具备改移条件">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <!-- <el-input v-model.trim="areaForm.whetherThereAreConditionsForRelocation" type="text" /> -->
+            <el-select v-model="areaForm.whetherThereAreConditionsForRelocation" class="short-input" clearable style="width: 100%;">
+              <el-option v-for="item in whetherItIsInTheCommunity" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="年代">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.yearOfCommencementOfOperation" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="类别">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.yearOfUse" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="有无管线建设批准文件">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <!-- <el-input v-model.trim="areaForm.isThereAnyPipelineConstructionApprovalDocument" type="text" /> -->
+            <el-select v-model="areaForm.isThereAnyPipelineConstructionApprovalDocument" class="short-input" clearable style="width: 100%;">
+              <el-option label="有" value="1" />
+              <el-option label="无" value="0" />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="管线埋深(m)">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.pipelineDepth" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="管径">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.pipeDiameter" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="管线压力">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.linePressure" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="占压管线长度(m)">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.pipelineLength" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="是否纳入技改计划">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <!-- <el-input v-model.trim="areaForm.whetherItIsIncludedInTheTechnicalReformPlan" type="text" /> -->
+            <el-select v-model="areaForm.whetherItIsIncludedInTheTechnicalReformPlan" class="short-input" clearable style="width: 100%;">
+              <el-option v-for="item in whetherItIsInTheCommunity" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="技改项目号">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.technicalTransformationProjectNumber" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="防控措施">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.preventionAndControlMeasures" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="治理计划">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.governancePlan" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="限购或停气情况">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.purchaseRestrictionOrGasShutdown" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="改线工程名称">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.nameOfTheDiversionProject" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="改线工程编号">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.numberOfTheDiversionProject" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="改线进展统计">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.progressStatisticsOfTheDiversionProject" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="与区县对接联系人">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.contactPerson" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="特级占压分类情况">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.superOccupyingPressureClassification" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="cancel">
-          确认
-        </el-button>
+        <div v-if="dialogFormTyle !== 'detail'">
+          <el-button type="primary" @click="confirm(dataFormRef)">
+            确认
+          </el-button>
+          <el-button type="info" @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
@@ -389,3 +524,15 @@
 }
 </style>
 
+<style lang="scss" scoped>
+// 样式
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/main/database/index.vue b/src/views/main/database/index.vue
index eece6ad..231b94c 100644
--- a/src/views/main/database/index.vue
+++ b/src/views/main/database/index.vue
@@ -1,20 +1,25 @@
 <!-- 管线占压数据管理 -->
 <script name="DatabaseManage" setup lang="ts">
-import { getCurrentInstance, onMounted, ref, watch } from 'vue'
-import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { DateModelType } from 'element-plus'
 import detailDialog from './detail.vue'
 import type { dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { batchDeleteOver, exporOver, getOverListPage, importOver, templateOver } from '@/api/page/database'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 
 // 查询条件
 const listQuery = ref({
-  recognitionCode: '', // 第三方code
+  hiddenDangerNumber: '', // 隐患编号
+  primaryClassification: '', // 一级分类
+  secondaryClassification: '', // 二级分类
+  hiddenDangerDescription: '', // 隐患描述
+  hiddenDangerLevel: '', // 隐患等级
+  responsibleManagementEnterprise: '', // 管理责任企业
+  discoveryTime: '', // 发现时间
+  governanceSituation: '', // 治理
   offset: 1,
   limit: 20,
 })
@@ -22,36 +27,22 @@
 const loadingTable = ref(false) // 表格loading
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '序号', value: 'recognitionCode', align: 'center', width: '160' },
-  { text: '隐患编号', value: 'recognitionType', align: 'center' },
-  { text: '一级分类', value: 'recognitionTime', align: 'center' },
-  { text: '二级分类', value: 'loglat', align: 'center' },
-  { text: '地点', value: 'position', align: 'center' },
-  { text: '发现时间', value: 'recognitionPrecision', align: 'center' },
-  { text: '隐患等级', value: 'recognitionLevel', align: 'center' },
-  { text: '管理责任企业', value: 'taskName', align: 'center' },
-  { text: '责任人', value: 'taskName', align: 'center' },
-  { text: '治理情况', value: 'taskName', align: 'center' },
-  { text: '消除时间', value: 'taskName', align: 'center' },
+  { text: '序号', value: 'serialNumber', align: 'center' },
+  { text: '隐患编号', value: 'hiddenDangerNumber', align: 'center' },
+  { text: '一级分类', value: 'primaryClassification', align: 'center' },
+  { text: '二级分类', value: 'secondaryClassification', align: 'center' },
+  { text: '地点', value: 'location', align: 'center' },
+  { text: '发现时间', value: 'discoveryTime', align: 'center' },
+  { text: '隐患等级', value: 'hiddenDangerLevel', align: 'center' },
+  { text: '管理责任企业', value: 'responsibleManagementEnterprise', align: 'center' },
+  { text: '责任人', value: 'personInCharge', align: 'center' },
+  { text: '治理情况', value: 'governanceSituation', align: 'center' },
+  { text: '消除时间', value: 'eliminationTime', align: 'center' },
 ])
 const list = ref([]) // 表格数据
-// 筛选时间段数据
-const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
-// 时间变更
-watch(dateRange, (val) => {
-  if (val) {
-    listQuery.value.beginDate = `${val[0]}`
-    listQuery.value.endDate = `${val[1]}`
-  }
-  else {
-    listQuery.value.beginDate = ''
-    listQuery.value.endDate = ''
-  }
-})
-
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -59,15 +50,19 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getIdentifyListPage(listQuery.value).then((res) => {
-  //   console.log(res.data, '第三方')
-  //   list.value = res.data.rows
-  //   total.value = parseInt(res.data.total)
-  //   loadingTable.value = false
-  // }).catch(() => {
-  list.value = [{}]
-  loadingTable.value = false
-  // })
+  getOverListPage(listQuery.value).then((res) => {
+    console.log(res.data, '管线占压')
+    list.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        eliminationTime: item.eliminationTime ? item.eliminationTime : '/',
+      }
+    })
+    total.value = parseInt(res.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 // 搜索
 const searchList = () => {
@@ -77,17 +72,17 @@
 // 重置
 const reset = () => {
   listQuery.value = {
-    alarmCode: '', // 报警编号
-    beginDate: '', // 报警开始时间
-    endDate: '', // 报警结束时间
-    alarmType: '1',
-    taskName: '', // 巡检任务名称
-    // position: '', // 报警位置
-    alarmStatus: '', // 报警状态
+    hiddenDangerNumber: '', // 隐患编号
+    primaryClassification: '', // 一级分类
+    secondaryClassification: '', // 二级分类
+    hiddenDangerDescription: '', // 隐患描述
+    hiddenDangerLevel: '', // 隐患等级
+    responsibleManagementEnterprise: '', // 管理责任企业
+    discoveryTime: '', // 发现时间
+    governanceSituation: '', // 治理
     offset: 1,
     limit: 20,
   }
-  dateRange.value = ['', ''] // 时间清空
   fetchData(true)
 }
 
@@ -98,19 +93,72 @@
 
 // 导出
 const exportList = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择需要导出的数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (list.value.length > 0) {
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
+  exportOver({ ids: checkoutList.value }).then((res) => {
+    exportFile(res.data, '管线占压数据列表.xlsx')
+    loading.close()
+  }).catch(() => {
+    loading.close()
+  })
 }
-
+// 导入
+const importRef = ref()
+const importList = () => {
+  importRef.value.click()
+}
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('file', event.target.files[0])
+    // fd.append('equipmentType', $props.equipmentType)
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    importOver(fd).then((res) => {
+      // 清空上传缓存
+      importRef.value.value = ''
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+        loading.close()
+        fetchData(true)
+      }
+      else {
+        loading.close()
+      }
+    }).catch(() => {
+      // 清空上传缓存
+      importRef.value.value = ''
+      loading.close()
+    })
+  }
+}
+// 删除
+const deleteList = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择需要删除的数据')
+    return
+  }
+  batchDeleteOver({ ids: checkoutList.value }).then((res) => {
+    ElMessage.success('操作成功')
+    fetchData(true)
+  })
+}
+// 模板下载
+const templateDownload = () => {
+  templateHole({}).then((res) => {
+    exportFile(res.data, '地下空洞模板')
+  })
+}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -127,18 +175,17 @@
 const handler = (type: string, row: any) => {
   handlerRef.value.initDialog(type, row)
 }
-// 处置报警
-const alarmRef = ref()
-const handlerAlarm = (row: IList) => {
-  alarmRef.value.initDialog(row)
-}
-const alarmStatusMap = ref<dictType[]>([]) // 报警状态
 
+const hiddenDangerLevelList = ref<dictType[]>([]) // 隐患等级
+const governanceSituationList = ref<dictType[]>([]) // 是否治理
 // 查询字典
 const getDict = async () => {
   // 巡检状态
-  getDictByCode('alarmStatus').then((response) => {
-    alarmStatusMap.value = response.data
+  getDictByCode('hiddenDangerLevel').then((response) => {
+    hiddenDangerLevelList.value = response.data
+  })
+  getDictByCode('isAlarm').then((response) => {
+    governanceSituationList.value = response.data
   })
 }
 
@@ -152,11 +199,11 @@
   <!-- 布局 -->
   <app-container>
     <!-- 编辑操作 -->
-    <detail-dialog ref="handlerRef" />
+    <detail-dialog ref="handlerRef" @refresh="searchList" />
     <search-area :need-clear="true" @search="searchList" @clear="reset">
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.hiddenDangerNumber"
           placeholder="隐患编号"
           class="short-input"
           clearable
@@ -164,7 +211,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.primaryClassification"
           placeholder="一级分类"
           class="short-input"
           clearable
@@ -172,7 +219,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.secondaryClassification"
           placeholder="二级分类"
           class="short-input"
           clearable
@@ -180,20 +227,20 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.hiddenDangerDescription"
           placeholder="隐患描述"
           class="short-input"
           clearable
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.alarmStatus" class="short-input" placeholder="隐患等级" clearable>
-          <el-option v-for="item in alarmStatusMap" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.hiddenDangerLevel" class="short-input" placeholder="隐患等级" clearable>
+          <el-option v-for="item in hiddenDangerLevelList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.responsibleManagementEnterprise"
           placeholder="管理责任公司"
           class="short-input"
           clearable
@@ -201,24 +248,27 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.value1"
+          v-model="listQuery.discoveryTime"
           type="date"
           placeholder="发现时间"
           style="width: 100%;"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD HH:mm:ss"
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.alarmStatus" class="short-input" placeholder="是否进行治理" clearable>
-          <el-option v-for="item in alarmStatusMap" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.governanceSituation" class="short-input" placeholder="是否进行治理" clearable>
+          <el-option v-for="item in governanceSituationList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新增" type="primary" @click="handler('create', {})" />
-        <icon-button icon="icon-delete" title="删除" type="primary" />
-        <icon-button icon="icon-template" title="模板下载" type="primary" />
-        <icon-button icon="icon-import" title="导入" type="primary" />
+        <icon-button icon="icon-delete" title="删除" type="primary" @click="deleteList" />
+        <icon-button icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
+        <icon-button icon="icon-import" title="导入" type="primary" @click="importList" />
+        <input ref="importRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
       </template>
       <normal-table
@@ -226,7 +276,7 @@
         is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="#" width="55" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/main/database/mapDialog.vue b/src/views/main/database/mapDialog.vue
index 3ed2919..c8e554e 100644
--- a/src/views/main/database/mapDialog.vue
+++ b/src/views/main/database/mapDialog.vue
@@ -7,7 +7,14 @@
 // const mapRef = ref()
 // const zoom = ref(18)
 // 初始化对话框
+const init = ref<any[]>([])
 const initDialog = (data: any) => {
+  if (data[0] && data[1]) {
+    init.value = [Number(data[0]), Number(data[1])]
+  }
+  else {
+    init.value = []
+  }
   dialogFormVisible.value = true
 }
 defineExpose({
@@ -32,7 +39,7 @@
   <el-dialog v-model="dialogFormVisible" title="地图选点" append-to-body width="50%">
     <div class="container">
       <!-- <map-component ref="mapRef" :zoom="zoom" /> -->
-      <marker-map @confirm="selectMarker" />
+      <marker-map v-if="dialogFormVisible" :init="init" @confirm="selectMarker" />
     </div>
     <template #footer>
       <div class="dialog-footer">

diff --git a/src/api/common.ts b/src/api/common.ts
new file mode 100644
index 0000000..cdfffe6
--- /dev/null
+++ b/src/api/common.ts
@@ -0,0 +1,16 @@
+import request from './index'
+// 获取文件地址
+export function getFileUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
+// 上传文件
+export function uploadFile(data: FormData) {
+  return request({
+    url: 'minio/file/upload',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/page/database.ts b/src/api/page/database.ts
new file mode 100644
index 0000000..7715aa5
--- /dev/null
+++ b/src/api/page/database.ts
@@ -0,0 +1,62 @@
+/**
+ * 管线占压相关接口
+ */
+import request from '../index'
+// 列表查询
+export function getOverListPage(params: any) {
+  return request({
+    url: `/system/busPipeOverstock/listPage?offset=${params.offset}&limit=${params.limit}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 导出
+export function exporOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/export',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 删除
+export function batchDeleteOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/delete',
+    method: 'post',
+    data: params,
+  })
+}
+// 模板下载
+export function templateOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/template',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 导入
+export function importOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/import',
+    method: 'post',
+    data: params,
+  })
+}
+// 新建
+export function addOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/add',
+    method: 'post',
+    data: params,
+  })
+}
+// 编辑
+export function editOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/edit',
+    method: 'post',
+    data: params,
+  })
+}
diff --git a/src/api/page/undergroundCavity.TS b/src/api/page/undergroundCavity.TS
new file mode 100644
index 0000000..afd0c20
--- /dev/null
+++ b/src/api/page/undergroundCavity.TS
@@ -0,0 +1,70 @@
+/**
+ * 地下空洞相关接口
+ */
+import request from '../index'
+// 列表查询
+export function getHoleListPage(params: any) {
+  return request({
+    url: `/system/busHole/listPage?offset=${params.offset}&limit=${params.limit}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 新建
+export function addHole(params: any) {
+  return request({
+    url: '/system/busHole/add',
+    method: 'post',
+    data: params,
+  })
+}
+// 编辑
+export function editHole(params: any) {
+  return request({
+    url: '/system/busHole/edit',
+    method: 'post',
+    data: params,
+  })
+}
+// 详情
+export function detailHole(params: any) {
+  return request({
+    url: '/system/busHole/detail',
+    method: 'post',
+    data: params,
+  })
+}
+// 导出
+export function exportHole(params: any) {
+  return request({
+    url: '/system/busHole/export',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 删除
+export function batchDeleteHole(params: any) {
+  return request({
+    url: '/system/busHole/delete',
+    method: 'post',
+    data: params,
+  })
+}
+// 模板下载
+export function templateHole(params: any) {
+  return request({
+    url: '/system/busHole/template',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 导入
+export function importHole(params: any) {
+  return request({
+    url: '/system/busHole/import',
+    method: 'post',
+    data: params,
+  })
+}
diff --git a/src/views/main/database/detail.vue b/src/views/main/database/detail.vue
index 31d6a63..a798fc6 100644
--- a/src/views/main/database/detail.vue
+++ b/src/views/main/database/detail.vue
@@ -1,10 +1,10 @@
 <!-- 管线占压详情 -->
 <script lang="ts" setup name="GanDetail">
-import type { FormRules } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import mapDialog from './mapDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
-// import { getGasDetail } from '@/api/page/gas'
+import { addOver, editOver } from '@/api/page/database'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -14,93 +14,196 @@
   update: '编辑',
   detail: '详情',
 })
-const areaForm = ref({
+const areaForm = ref<{ [key: string]: string }>({
+  serialNumber: '', // 序号
+  hiddenDangerNumber: '', // 隐患标号
+  primaryClassification: '', // 一级分类
+  secondaryClassification: '', // 二级分类
+  hiddenDangerDescription: '', // 隐患描述
+  pipeNetworkType: '', // 管网类型
+  equipmentNumber: '', // 编码
+  location: '', // 地点
+  longitude: '', // 经度
+  latitude: '', // 纬度
+  whetherItIsInTheCommunity: '', // 是否在小区内
+  occupyingType: '', // 小区内占压类型
+  communityName: '', // 小区名称
+  discoveryTime: '', // 发现时间
+  hiddenDangerLevel: '', // 隐患等级
+  responsibleManagementEnterprise: '', // 责任管理企业
+  personInCharge: '', // 责任人
+  plannedEliminationTimeLimit: '', // 计划消除时限
+  governanceSituation: '', // 治理情况
+  eliminationTime: '', // 消除时间
+  propertyRightNature: '', // 产权性质
+  remark: '', // 备注
+  occupiedEnterprisePersonalName: '', // 占压企业/个人名称
+  occupationUnitProperty: '', // 占压单位性质
+  dateOfConstructionOfTheOccupation: '', // 占压物建成年份
+  anyApprovalDocumentsForTheConstruction: '', // 有无占压物批准文件
+  useOfTheOccupation: '', // 占压物用途
+  descriptionOfTheOccupation: '', // 占压物描述
+  areThereRegularStaffActivities: '', // 有无经常性人员活动
+  areaOfOccupation: '', // 占压物面积
+  whetherThereAreConditionsForRelocation: '', // 占压物面积
+  yearOfUse: '', // 年代类别
+  yearOfCommencementOfOperation: '', // 年份
+  isThereAnyPipelineConstructionApprovalDocument: '', // 有无建设批准文件
+  pipelineDepth: '', // 管线埋深
+  pipeDiameter: '', // 管径
+  linePressure: '', // 管线压力
+  pipelineLength: '', // 占压管线长度
+  whetherItIsIncludedInTheTechnicalReformPlan: '', // 是否纳入技改计划
+  technicalTransformationProjectNumber: '', // 技改项目号
+  preventionAndControlMeasures: '', // 防控措施
+  governancePlan: '', // 治理计划
+  purchaseRestrictionOrGasShutdown: '', // 限购或停气情况
+  nameOfTheDiversionProject: '', // 改线工程名称
+  numberOfTheDiversionProject: '', // 改线工程编号
+  progressStatisticsOfTheDiversionProject: '', // 改线进度统计
+  contactPerson: '', // 与区县对接联系人
+  superOccupyingPressureClassification: '', // 特级占压分类情况
 }) // 表单
 const rules: FormRules = {
+  hiddenDangerNumber: [{ required: true, message: '隐患编号必填', trigger: ['blur', 'change'] }],
+  primaryClassification: [{ required: true, message: '一级分类必填', trigger: ['blur', 'change'] }],
+  secondaryClassification: [{ required: true, message: '二级分类必填', trigger: ['blur', 'change'] }],
+  hiddenDangerDescription: [{ required: true, message: '隐患描述必填', trigger: ['blur', 'change'] }],
+  pipeNetworkType: [{ required: true, message: '管网类型必填', trigger: ['blur', 'change'] }],
+  equipmentNumber: [{ required: true, message: '编码必填', trigger: ['blur', 'change'] }],
+  location: [{ required: true, message: '地点必填', trigger: ['blur', 'change'] }],
+  discoveryTime: [{ required: true, message: '发现时间必选', trigger: ['blur', 'change'] }],
+  hiddenDangerLevel: [{ required: true, message: '隐患等级必选', trigger: ['blur', 'change'] }],
+  responsibleManagementEnterprise: [{ required: true, message: '责任管理企业必填', trigger: ['blur', 'change'] }],
+  personInCharge: [{ required: true, message: '责任人必填', trigger: ['blur', 'change'] }],
+  governanceSituation: [{ required: true, message: '治理情况必填', trigger: ['blur', 'change'] }],
 } // 前端校验规则
-// 获取处置原因
-const cancelReasonList = ref<{ name: string;value: string;id: string }[]>()
+// 获取字典
+const whetherItIsInTheCommunity = ref<{ name: string;value: string;id: string }[]>() // 是否在小区内
+const hiddenDangerLevel = ref<{ name: string;value: string;id: string }[]>() // 隐患等级
 const fetchDict = () => {
-  getDictByCode('alarmHandlerReason').then((res) => {
-    cancelReasonList.value = res.data
+  getDictByCode('isAlarm').then((res) => {
+    whetherItIsInTheCommunity.value = res.data
+  })
+  getDictByCode('hiddenDangerLevel').then((res) => {
+    hiddenDangerLevel.value = res.data
   })
 }
 fetchDict()
-// 初始化对话框
-const initDialog = (type: string, row: any) => {
-  dialogFormVisible.value = true
-  dialogFormTyle.value = type
-  areaForm.value = row
+
+// 重置
+const resetForm = () => {
+  areaForm.value
+  for (const i in areaForm.value) {
+    areaForm.value[i] = ''
+  }
+  nextTick(() => {
+    dataFormRef.value?.clearValidate()
+  })
 }
-defineExpose({
-  initDialog,
-})
 // 取消
 const cancel = () => {
+  resetForm()
   dialogFormVisible.value = false
 }
+// 保存数据
+const saveData = () => {
+  // addHole
+  // editHole
+  (dialogFormTyle.value === 'create' ? addOver : editOver)(areaForm.value).then((res) => {
+    ElMessage.success('操作成功')
+    emits('refresh')
+    resetForm()
+    dialogFormVisible.value = false
+  })
+}
+// 确认
+const confirm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      if (valid) {
+        saveData()
+      }
+    }
+  })
+}
 // 地图选点
 const mapRef = ref()
 const selectMap = () => {
-  mapRef.value.initDialog()
+  mapRef.value.initDialog([areaForm.value.longitude, areaForm.value.latitude])
 }
 const confirmMap = (location: any) => {
   console.log(location, '选择的位置')
+  areaForm.value.longitude = location[0]
+  areaForm.value.latitude = location[1]
 }
+// 初始化对话框
+const initDialog = (type: string, row: any) => {
+  dialogFormVisible.value = true
+  dialogFormTyle.value = type
+  areaForm.value = JSON.parse(JSON.stringify(row))
+  if (type === 'create') {
+    resetForm()
+  }
+}
+defineExpose({
+  initDialog,
+})
 </script>
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="typeDict[dialogFormTyle]" append-to-body width="65%" top="10vh">
     <!-- 地图选点 -->
     <map-dialog ref="mapRef" @confirm="confirmMap" />
-    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
+    <el-form ref="dataFormRef" :class="[dialogFormTyle === 'detail' ? 'isDetail' : '']" :disabled="dialogFormTyle === 'detail'" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="序号">
-            <el-input v-model.trim="areaForm.couplingCode" type="text" />
+            <el-input v-model.trim="areaForm.serialNumber" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="隐患编号" disabled>
-            <el-input v-model.trim="areaForm.couplingTime" type="text" />
+          <el-form-item label="隐患编号" prop="hiddenDangerNumber">
+            <el-input v-model.trim="areaForm.hiddenDangerNumber" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="一级分类" disabled>
-            <el-input v-model.trim="areaForm.couplingTime" type="text" />
+          <el-form-item label="一级分类" prop="primaryClassification">
+            <el-input v-model.trim="areaForm.primaryClassification" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
-          <el-form-item label="二级分类">
-            <el-input v-model.trim="areaForm.couplingResult" type="text" />
+          <el-form-item label="二级分类" prop="secondaryClassification">
+            <el-input v-model.trim="areaForm.secondaryClassification" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="16">
-          <el-form-item label="隐患描述">
-            <el-input v-model.trim="areaForm.loglat" type="text" />
+          <el-form-item label="隐患描述" prop="hiddenDangerDescription">
+            <el-input v-model.trim="areaForm.hiddenDangerDescription" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
-          <el-form-item label="管网类型">
-            <el-input v-model.trim="areaForm.recognitionLevel" type="text" />
+          <el-form-item label="管网类型" prop="pipeNetworkType">
+            <el-input v-model.trim="areaForm.pipeNetworkType" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="管网、设备编码">
-            <el-input v-model.trim="areaForm.recognitionValue" type="text" />
+          <el-form-item label="管网、设备编码" prop="equipmentNumber">
+            <el-input v-model.trim="areaForm.equipmentNumber" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="所在区县">
-            <el-input v-model.trim="areaForm.recognitionValue" type="text" />
+          <el-form-item label="地点" prop="location">
+            <el-input v-model.trim="areaForm.location" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="24">
+      <!-- <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="所在街乡">
             <el-input v-model.trim="areaForm.holeLeve" type="text" />
@@ -111,19 +214,19 @@
             <el-input v-model.trim="areaForm.holeValue" type="text" />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="经度">
-            <el-input v-model.trim="areaForm.overstockLeve" type="text" />
+            <el-input v-model.trim="areaForm.longitude" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="纬度">
-            <el-input v-model.trim="areaForm.overstockValue" type="text" />
+            <el-input v-model.trim="areaForm.latitude" type="text" />
           </el-form-item>
         </el-col>
-        <el-col :span="4">
+        <el-col v-if="dialogFormTyle !== 'detail'" :span="4">
           <div style="margin-left: 15px;" class="icon-map" @click="selectMap">
             <el-tooltip
               class="box-item"
@@ -139,56 +242,63 @@
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="是否在小区内">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <!-- <el-input v-model.trim="areaForm.whetherItIsInTheCommunity" type="text" /> -->
+            <el-select v-model="areaForm.whetherItIsInTheCommunity" class="short-input" clearable style="width: 100%;">
+              <el-option v-for="item in whetherItIsInTheCommunity" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="小区内占压类型">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.occupyingType" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="小区名称">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.communityName" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
-          <el-form-item label="发现时间">
+          <el-form-item label="发现时间" prop="discoveryTime">
             <el-date-picker
-              v-model="value1"
+              v-model="areaForm.discoveryTime"
               type="datetime"
-              placeholder="发现时间"
               style="width: 100%;"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD HH:mm:ss"
             />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="隐患等级">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+          <el-form-item label="隐患等级" prop="hiddenDangerLevel">
+            <!-- <el-input v-model.trim="areaForm.gasValue" type="text" /> -->
+            <el-select v-model="areaForm.hiddenDangerLevel" class="short-input" clearable style="width: 100%;">
+              <el-option v-for="item in hiddenDangerLevel" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="管理责任企业">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+          <el-form-item label="管理责任企业" prop="responsibleManagementEnterprise">
+            <el-input v-model.trim="areaForm.responsibleManagementEnterprise" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
-          <el-form-item label="责任人">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+          <el-form-item label="责任人" prop="personInCharge">
+            <el-input v-model.trim="areaForm.personInCharge" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="计划消除时限">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+          <el-form-item label="计划消除时限" prop="plannedEliminationTimeLimit">
+            <el-input v-model.trim="areaForm.plannedEliminationTimeLimit" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="治理情况">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+          <el-form-item label="治理情况" prop="governanceSituation">
+            <el-input v-model.trim="areaForm.governanceSituation" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -196,178 +306,203 @@
         <el-col :span="8">
           <el-form-item label="消除时间">
             <el-date-picker
-              v-model="value1"
+              v-model="areaForm.eliminationTime"
               type="datetime"
-              placeholder="消除时间"
               style="width: 100%;"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD HH:mm:ss"
             />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="产权性质">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.propertyRightNature" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="备注">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.remark" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="占压企业/个人名称">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.occupiedEnterprisePersonalName" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压单位性质">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.occupationUnitProperty" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压物建成年代">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.dateOfConstructionOfTheOccupation" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="有无占压物建设批准文件">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <!-- <el-input v-model.trim="areaForm." type="text" /> -->
+            <el-select v-model="areaForm.anyApprovalDocumentsForTheConstruction" class="short-input" clearable style="width: 100%;">
+              <el-option label="有" value="1" />
+              <el-option label="无" value="0" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压物用途">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.useOfTheOccupation" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压物描述">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.descriptionOfTheOccupation" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="有无经常性人员活动">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.areThereRegularStaffActivities" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压物面积(m²)">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.areaOfOccupation" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="是否具备改移条件">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <!-- <el-input v-model.trim="areaForm.whetherThereAreConditionsForRelocation" type="text" /> -->
+            <el-select v-model="areaForm.whetherThereAreConditionsForRelocation" class="short-input" clearable style="width: 100%;">
+              <el-option v-for="item in whetherItIsInTheCommunity" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="年代">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.yearOfCommencementOfOperation" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="类别">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.yearOfUse" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="有无管线建设批准文件">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <!-- <el-input v-model.trim="areaForm.isThereAnyPipelineConstructionApprovalDocument" type="text" /> -->
+            <el-select v-model="areaForm.isThereAnyPipelineConstructionApprovalDocument" class="short-input" clearable style="width: 100%;">
+              <el-option label="有" value="1" />
+              <el-option label="无" value="0" />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="管线埋深(m)">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.pipelineDepth" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="管径">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.pipeDiameter" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="管线压力">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.linePressure" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="占压管线长度(m)">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.pipelineLength" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="是否纳入技改计划">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <!-- <el-input v-model.trim="areaForm.whetherItIsIncludedInTheTechnicalReformPlan" type="text" /> -->
+            <el-select v-model="areaForm.whetherItIsIncludedInTheTechnicalReformPlan" class="short-input" clearable style="width: 100%;">
+              <el-option v-for="item in whetherItIsInTheCommunity" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="技改项目号">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.technicalTransformationProjectNumber" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="防控措施">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.preventionAndControlMeasures" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="治理计划">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.governancePlan" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="限购或停气情况">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.purchaseRestrictionOrGasShutdown" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="改线工程名称">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.nameOfTheDiversionProject" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="改线工程编号">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.numberOfTheDiversionProject" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="改线进展统计">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.progressStatisticsOfTheDiversionProject" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="与区县对接联系人">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.contactPerson" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="特级占压分类情况">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.superOccupyingPressureClassification" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="cancel">
-          确认
-        </el-button>
+        <div v-if="dialogFormTyle !== 'detail'">
+          <el-button type="primary" @click="confirm(dataFormRef)">
+            确认
+          </el-button>
+          <el-button type="info" @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
@@ -389,3 +524,15 @@
 }
 </style>
 
+<style lang="scss" scoped>
+// 样式
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/main/database/index.vue b/src/views/main/database/index.vue
index eece6ad..231b94c 100644
--- a/src/views/main/database/index.vue
+++ b/src/views/main/database/index.vue
@@ -1,20 +1,25 @@
 <!-- 管线占压数据管理 -->
 <script name="DatabaseManage" setup lang="ts">
-import { getCurrentInstance, onMounted, ref, watch } from 'vue'
-import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { DateModelType } from 'element-plus'
 import detailDialog from './detail.vue'
 import type { dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { batchDeleteOver, exporOver, getOverListPage, importOver, templateOver } from '@/api/page/database'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 
 // 查询条件
 const listQuery = ref({
-  recognitionCode: '', // 第三方code
+  hiddenDangerNumber: '', // 隐患编号
+  primaryClassification: '', // 一级分类
+  secondaryClassification: '', // 二级分类
+  hiddenDangerDescription: '', // 隐患描述
+  hiddenDangerLevel: '', // 隐患等级
+  responsibleManagementEnterprise: '', // 管理责任企业
+  discoveryTime: '', // 发现时间
+  governanceSituation: '', // 治理
   offset: 1,
   limit: 20,
 })
@@ -22,36 +27,22 @@
 const loadingTable = ref(false) // 表格loading
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '序号', value: 'recognitionCode', align: 'center', width: '160' },
-  { text: '隐患编号', value: 'recognitionType', align: 'center' },
-  { text: '一级分类', value: 'recognitionTime', align: 'center' },
-  { text: '二级分类', value: 'loglat', align: 'center' },
-  { text: '地点', value: 'position', align: 'center' },
-  { text: '发现时间', value: 'recognitionPrecision', align: 'center' },
-  { text: '隐患等级', value: 'recognitionLevel', align: 'center' },
-  { text: '管理责任企业', value: 'taskName', align: 'center' },
-  { text: '责任人', value: 'taskName', align: 'center' },
-  { text: '治理情况', value: 'taskName', align: 'center' },
-  { text: '消除时间', value: 'taskName', align: 'center' },
+  { text: '序号', value: 'serialNumber', align: 'center' },
+  { text: '隐患编号', value: 'hiddenDangerNumber', align: 'center' },
+  { text: '一级分类', value: 'primaryClassification', align: 'center' },
+  { text: '二级分类', value: 'secondaryClassification', align: 'center' },
+  { text: '地点', value: 'location', align: 'center' },
+  { text: '发现时间', value: 'discoveryTime', align: 'center' },
+  { text: '隐患等级', value: 'hiddenDangerLevel', align: 'center' },
+  { text: '管理责任企业', value: 'responsibleManagementEnterprise', align: 'center' },
+  { text: '责任人', value: 'personInCharge', align: 'center' },
+  { text: '治理情况', value: 'governanceSituation', align: 'center' },
+  { text: '消除时间', value: 'eliminationTime', align: 'center' },
 ])
 const list = ref([]) // 表格数据
-// 筛选时间段数据
-const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
-// 时间变更
-watch(dateRange, (val) => {
-  if (val) {
-    listQuery.value.beginDate = `${val[0]}`
-    listQuery.value.endDate = `${val[1]}`
-  }
-  else {
-    listQuery.value.beginDate = ''
-    listQuery.value.endDate = ''
-  }
-})
-
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -59,15 +50,19 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getIdentifyListPage(listQuery.value).then((res) => {
-  //   console.log(res.data, '第三方')
-  //   list.value = res.data.rows
-  //   total.value = parseInt(res.data.total)
-  //   loadingTable.value = false
-  // }).catch(() => {
-  list.value = [{}]
-  loadingTable.value = false
-  // })
+  getOverListPage(listQuery.value).then((res) => {
+    console.log(res.data, '管线占压')
+    list.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        eliminationTime: item.eliminationTime ? item.eliminationTime : '/',
+      }
+    })
+    total.value = parseInt(res.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 // 搜索
 const searchList = () => {
@@ -77,17 +72,17 @@
 // 重置
 const reset = () => {
   listQuery.value = {
-    alarmCode: '', // 报警编号
-    beginDate: '', // 报警开始时间
-    endDate: '', // 报警结束时间
-    alarmType: '1',
-    taskName: '', // 巡检任务名称
-    // position: '', // 报警位置
-    alarmStatus: '', // 报警状态
+    hiddenDangerNumber: '', // 隐患编号
+    primaryClassification: '', // 一级分类
+    secondaryClassification: '', // 二级分类
+    hiddenDangerDescription: '', // 隐患描述
+    hiddenDangerLevel: '', // 隐患等级
+    responsibleManagementEnterprise: '', // 管理责任企业
+    discoveryTime: '', // 发现时间
+    governanceSituation: '', // 治理
     offset: 1,
     limit: 20,
   }
-  dateRange.value = ['', ''] // 时间清空
   fetchData(true)
 }
 
@@ -98,19 +93,72 @@
 
 // 导出
 const exportList = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择需要导出的数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (list.value.length > 0) {
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
+  exportOver({ ids: checkoutList.value }).then((res) => {
+    exportFile(res.data, '管线占压数据列表.xlsx')
+    loading.close()
+  }).catch(() => {
+    loading.close()
+  })
 }
-
+// 导入
+const importRef = ref()
+const importList = () => {
+  importRef.value.click()
+}
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('file', event.target.files[0])
+    // fd.append('equipmentType', $props.equipmentType)
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    importOver(fd).then((res) => {
+      // 清空上传缓存
+      importRef.value.value = ''
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+        loading.close()
+        fetchData(true)
+      }
+      else {
+        loading.close()
+      }
+    }).catch(() => {
+      // 清空上传缓存
+      importRef.value.value = ''
+      loading.close()
+    })
+  }
+}
+// 删除
+const deleteList = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择需要删除的数据')
+    return
+  }
+  batchDeleteOver({ ids: checkoutList.value }).then((res) => {
+    ElMessage.success('操作成功')
+    fetchData(true)
+  })
+}
+// 模板下载
+const templateDownload = () => {
+  templateHole({}).then((res) => {
+    exportFile(res.data, '地下空洞模板')
+  })
+}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -127,18 +175,17 @@
 const handler = (type: string, row: any) => {
   handlerRef.value.initDialog(type, row)
 }
-// 处置报警
-const alarmRef = ref()
-const handlerAlarm = (row: IList) => {
-  alarmRef.value.initDialog(row)
-}
-const alarmStatusMap = ref<dictType[]>([]) // 报警状态
 
+const hiddenDangerLevelList = ref<dictType[]>([]) // 隐患等级
+const governanceSituationList = ref<dictType[]>([]) // 是否治理
 // 查询字典
 const getDict = async () => {
   // 巡检状态
-  getDictByCode('alarmStatus').then((response) => {
-    alarmStatusMap.value = response.data
+  getDictByCode('hiddenDangerLevel').then((response) => {
+    hiddenDangerLevelList.value = response.data
+  })
+  getDictByCode('isAlarm').then((response) => {
+    governanceSituationList.value = response.data
   })
 }
 
@@ -152,11 +199,11 @@
   <!-- 布局 -->
   <app-container>
     <!-- 编辑操作 -->
-    <detail-dialog ref="handlerRef" />
+    <detail-dialog ref="handlerRef" @refresh="searchList" />
     <search-area :need-clear="true" @search="searchList" @clear="reset">
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.hiddenDangerNumber"
           placeholder="隐患编号"
           class="short-input"
           clearable
@@ -164,7 +211,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.primaryClassification"
           placeholder="一级分类"
           class="short-input"
           clearable
@@ -172,7 +219,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.secondaryClassification"
           placeholder="二级分类"
           class="short-input"
           clearable
@@ -180,20 +227,20 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.hiddenDangerDescription"
           placeholder="隐患描述"
           class="short-input"
           clearable
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.alarmStatus" class="short-input" placeholder="隐患等级" clearable>
-          <el-option v-for="item in alarmStatusMap" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.hiddenDangerLevel" class="short-input" placeholder="隐患等级" clearable>
+          <el-option v-for="item in hiddenDangerLevelList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.responsibleManagementEnterprise"
           placeholder="管理责任公司"
           class="short-input"
           clearable
@@ -201,24 +248,27 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.value1"
+          v-model="listQuery.discoveryTime"
           type="date"
           placeholder="发现时间"
           style="width: 100%;"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD HH:mm:ss"
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.alarmStatus" class="short-input" placeholder="是否进行治理" clearable>
-          <el-option v-for="item in alarmStatusMap" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.governanceSituation" class="short-input" placeholder="是否进行治理" clearable>
+          <el-option v-for="item in governanceSituationList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新增" type="primary" @click="handler('create', {})" />
-        <icon-button icon="icon-delete" title="删除" type="primary" />
-        <icon-button icon="icon-template" title="模板下载" type="primary" />
-        <icon-button icon="icon-import" title="导入" type="primary" />
+        <icon-button icon="icon-delete" title="删除" type="primary" @click="deleteList" />
+        <icon-button icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
+        <icon-button icon="icon-import" title="导入" type="primary" @click="importList" />
+        <input ref="importRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
       </template>
       <normal-table
@@ -226,7 +276,7 @@
         is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="#" width="55" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/main/database/mapDialog.vue b/src/views/main/database/mapDialog.vue
index 3ed2919..c8e554e 100644
--- a/src/views/main/database/mapDialog.vue
+++ b/src/views/main/database/mapDialog.vue
@@ -7,7 +7,14 @@
 // const mapRef = ref()
 // const zoom = ref(18)
 // 初始化对话框
+const init = ref<any[]>([])
 const initDialog = (data: any) => {
+  if (data[0] && data[1]) {
+    init.value = [Number(data[0]), Number(data[1])]
+  }
+  else {
+    init.value = []
+  }
   dialogFormVisible.value = true
 }
 defineExpose({
@@ -32,7 +39,7 @@
   <el-dialog v-model="dialogFormVisible" title="地图选点" append-to-body width="50%">
     <div class="container">
       <!-- <map-component ref="mapRef" :zoom="zoom" /> -->
-      <marker-map @confirm="selectMarker" />
+      <marker-map v-if="dialogFormVisible" :init="init" @confirm="selectMarker" />
     </div>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/main/undergroundCavity/detail.vue b/src/views/main/undergroundCavity/detail.vue
new file mode 100644
index 0000000..4db2e56
--- /dev/null
+++ b/src/views/main/undergroundCavity/detail.vue
@@ -0,0 +1,288 @@
+<!-- 地下空洞详情 -->
+<script lang="ts" setup name="GanDetail">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import uploadFile from './upload.vue'
+import mapDialog from '@/views/main/database/mapDialog.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { addHole, detailHole, editHole } from '@/api/page/undergroundCavity'
+const emits = defineEmits(['refresh'])
+const dataFormRef = ref()
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogFormTyle = ref('create')
+const typeDict = ref<{ [key: string]: string }>({
+  create: '新建',
+  update: '编辑',
+  detail: '详情',
+})
+const areaForm = ref({
+  abnormolWave: '', // 异常波形
+  detectionDistance: '', // 探测距离
+  holeSize: '', // 空洞大小
+  holeType: '', // 空洞类型
+  holePicture: '', // 空洞图片
+  detectionTime: '', // 探测时间
+  riskLevel: '', // 风险等级
+  lnglat: '', // 经纬度
+  longitude: '', // 经度
+  latitude: '', // 纬度
+  position: '', // 空洞位置
+  isHandle: '', // 是否进行治理
+}) // 表单
+const rules: FormRules = {
+  abnormolWave: [{ required: true, message: '异常波形必填', trigger: ['blur', 'change'] }],
+  detectionDistance: [{ required: true, message: '探测距离必填', trigger: ['blur', 'change'] }],
+  holeSize: [{ required: true, message: '空洞大小必填', trigger: ['blur', 'change'] }],
+  holeType: [{ required: true, message: '空洞类型必填', trigger: ['blur', 'change'] }],
+  // holePicture: [{ required: true, message: '空洞图片必须上传', trigger: ['blur', 'change'] }],
+  detectionTime: [{ required: true, message: '探测时间必选', trigger: ['blur', 'change'] }],
+  riskLevel: [{ required: true, message: '风险等级必选', trigger: ['blur', 'change'] }],
+  position: [{ required: true, message: '空洞位置必填', trigger: ['blur', 'change'] }],
+} // 前端校验规则
+// 字典
+const riskLevelList = ref<{ name: string;value: string;id: string }[]>() // 风险等级
+const handlerList = ref<{ name: string;value: string;id: string }[]>([]) // 是否治理
+const fetchDict = () => {
+  getDictByCode('holeRiskLevel').then((res) => {
+    riskLevelList.value = res.data
+  })
+  getDictByCode('isAlarm').then((response) => {
+    handlerList.value = response.data
+  })
+}
+fetchDict()
+// 重置
+const resetForm = () => {
+  areaForm.value = {
+    abnormolWave: '', // 异常波形
+    detectionDistance: '', // 探测距离
+    holeSize: '', // 空洞大小
+    holeType: '', // 空洞类型
+    holePicture: '', // 空洞图片
+    detectionTime: '', // 探测时间
+    riskLevel: '', // 风险等级
+    lnglat: '', // 经纬度
+    longitude: '', // 经度
+    latitude: '', // 纬度
+    position: '', // 空洞位置
+    isHandle: '', // 是否进行治理
+  }
+  nextTick(() => {
+    dataFormRef.value?.clearValidate()
+  })
+}
+// 取消
+const cancel = () => {
+  resetForm()
+  dialogFormVisible.value = false
+}
+
+// 保存数据
+const saveData = () => {
+  // addHole
+  // editHole
+  (dialogFormTyle.value === 'create' ? addHole : editHole)(areaForm.value).then((res) => {
+    ElMessage.success('操作成功')
+    emits('refresh')
+    resetForm()
+    dialogFormVisible.value = false
+  })
+}
+// 确认
+const confirm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      if (valid) {
+        saveData()
+      }
+    }
+  })
+}
+// 地图选点
+const mapRef = ref()
+const selectMap = () => {
+  mapRef.value.initDialog([areaForm.value.longitude, areaForm.value.latitude])
+}
+const confirmMap = (location: any) => {
+  console.log(location, '选择的位置')
+  areaForm.value.longitude = location[0]
+  areaForm.value.latitude = location[1]
+  areaForm.value.lnglat = location.join()
+}
+// 初始化对话框
+const initDialog = (type: string, row: any) => {
+  dialogFormVisible.value = true
+  dialogFormTyle.value = type
+  areaForm.value = JSON.parse(JSON.stringify(row))
+  if (type === 'create') {
+    resetForm()
+  }
+}
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" :title="typeDict[dialogFormTyle]" append-to-body width="35%">
+    <!-- 地图选点 -->
+    <map-dialog ref="mapRef" @confirm="confirmMap" />
+    <el-form ref="dataFormRef" :class="[dialogFormTyle === 'detail' ? 'isDetail' : '']" :rules="rules" :model="areaForm" label-position="right" label-width="120px" :disabled="dialogFormTyle === 'detail'">
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="异常波形" prop="abnormolWave">
+            <el-input v-model.trim="areaForm.abnormolWave" type="text" placeholder="异常波形" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="探测距离" prop="detectionDistance">
+            <el-input v-model.trim="areaForm.detectionDistance" type="text" placeholder="探测距离" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="空洞大小" prop="holeSize">
+            <el-input v-model.trim="areaForm.holeSize" type="text" placeholder="空洞大小" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="空洞类型" prop="holeType">
+            <el-input v-model.trim="areaForm.holeType" type="text" placeholder="空洞类型" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <!-- <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="空洞图片" prop="holePicture">
+            <upload-file v-model.trim="areaForm.holePicture" />
+          </el-form-item>
+        </el-col>
+      </el-row> -->
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="探测时间" prop="detectionTime">
+            <el-date-picker
+              v-model="areaForm.detectionTime"
+              type="date"
+              placeholder="探测时间"
+              style="width: 100%;"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD HH:mm:ss"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="风险等级" prop="riskLevel">
+            <el-select v-model="areaForm.riskLevel" class="short-input" placeholder="风险等级" clearable style="width: 100%;">
+              <el-option v-for="item in riskLevelList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="空洞经纬度" prop="lnglat">
+            <el-input v-model.trim="areaForm.lnglat" type="text" placeholder="空洞经纬度" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="dialogFormTyle !== 'detail'" :span="4">
+          <div style="margin-left: 15px;" class="icon-map" @click="selectMap">
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              content="地图选点"
+              placement="top"
+            >
+              <svg-icon name="icon-xunjian" style="width: 35px;height: 35px;" />
+            </el-tooltip>
+          </div>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="空洞位置" prop="position">
+            <el-input v-model.trim="areaForm.position" type="textarea" maxlength="100" show-word-limit :rows="2" placeholder="空洞位置" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="是否进行治理">
+            <el-select v-model="areaForm.isHandle" class="short-input" placeholder="是否进行治理" clearable style="width: 100%;">
+              <el-option v-for="item in handlerList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <!-- <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="治理描述">
+            <el-input v-model.trim="areaForm.gasLevel" type="textarea" show-word-limit :rows="3" maxlength="100" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="备注">
+            <el-input v-model.trim="areaForm.gasLevel" type="textarea" show-word-limit :rows="3" maxlength="100" />
+          </el-form-item>
+        </el-col>
+      </el-row> -->
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <div v-if="dialogFormTyle !== 'detail'">
+          <el-button type="primary" @click="confirm(dataFormRef)">
+            确认
+          </el-button>
+          <el-button type="info" @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.icon-map {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
+
+<style lang="scss" scoped>
+// 样式
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+</style>
+

diff --git a/src/api/common.ts b/src/api/common.ts
new file mode 100644
index 0000000..cdfffe6
--- /dev/null
+++ b/src/api/common.ts
@@ -0,0 +1,16 @@
+import request from './index'
+// 获取文件地址
+export function getFileUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
+// 上传文件
+export function uploadFile(data: FormData) {
+  return request({
+    url: 'minio/file/upload',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/page/database.ts b/src/api/page/database.ts
new file mode 100644
index 0000000..7715aa5
--- /dev/null
+++ b/src/api/page/database.ts
@@ -0,0 +1,62 @@
+/**
+ * 管线占压相关接口
+ */
+import request from '../index'
+// 列表查询
+export function getOverListPage(params: any) {
+  return request({
+    url: `/system/busPipeOverstock/listPage?offset=${params.offset}&limit=${params.limit}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 导出
+export function exporOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/export',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 删除
+export function batchDeleteOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/delete',
+    method: 'post',
+    data: params,
+  })
+}
+// 模板下载
+export function templateOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/template',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 导入
+export function importOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/import',
+    method: 'post',
+    data: params,
+  })
+}
+// 新建
+export function addOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/add',
+    method: 'post',
+    data: params,
+  })
+}
+// 编辑
+export function editOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/edit',
+    method: 'post',
+    data: params,
+  })
+}
diff --git a/src/api/page/undergroundCavity.TS b/src/api/page/undergroundCavity.TS
new file mode 100644
index 0000000..afd0c20
--- /dev/null
+++ b/src/api/page/undergroundCavity.TS
@@ -0,0 +1,70 @@
+/**
+ * 地下空洞相关接口
+ */
+import request from '../index'
+// 列表查询
+export function getHoleListPage(params: any) {
+  return request({
+    url: `/system/busHole/listPage?offset=${params.offset}&limit=${params.limit}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 新建
+export function addHole(params: any) {
+  return request({
+    url: '/system/busHole/add',
+    method: 'post',
+    data: params,
+  })
+}
+// 编辑
+export function editHole(params: any) {
+  return request({
+    url: '/system/busHole/edit',
+    method: 'post',
+    data: params,
+  })
+}
+// 详情
+export function detailHole(params: any) {
+  return request({
+    url: '/system/busHole/detail',
+    method: 'post',
+    data: params,
+  })
+}
+// 导出
+export function exportHole(params: any) {
+  return request({
+    url: '/system/busHole/export',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 删除
+export function batchDeleteHole(params: any) {
+  return request({
+    url: '/system/busHole/delete',
+    method: 'post',
+    data: params,
+  })
+}
+// 模板下载
+export function templateHole(params: any) {
+  return request({
+    url: '/system/busHole/template',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 导入
+export function importHole(params: any) {
+  return request({
+    url: '/system/busHole/import',
+    method: 'post',
+    data: params,
+  })
+}
diff --git a/src/views/main/database/detail.vue b/src/views/main/database/detail.vue
index 31d6a63..a798fc6 100644
--- a/src/views/main/database/detail.vue
+++ b/src/views/main/database/detail.vue
@@ -1,10 +1,10 @@
 <!-- 管线占压详情 -->
 <script lang="ts" setup name="GanDetail">
-import type { FormRules } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import mapDialog from './mapDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
-// import { getGasDetail } from '@/api/page/gas'
+import { addOver, editOver } from '@/api/page/database'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -14,93 +14,196 @@
   update: '编辑',
   detail: '详情',
 })
-const areaForm = ref({
+const areaForm = ref<{ [key: string]: string }>({
+  serialNumber: '', // 序号
+  hiddenDangerNumber: '', // 隐患标号
+  primaryClassification: '', // 一级分类
+  secondaryClassification: '', // 二级分类
+  hiddenDangerDescription: '', // 隐患描述
+  pipeNetworkType: '', // 管网类型
+  equipmentNumber: '', // 编码
+  location: '', // 地点
+  longitude: '', // 经度
+  latitude: '', // 纬度
+  whetherItIsInTheCommunity: '', // 是否在小区内
+  occupyingType: '', // 小区内占压类型
+  communityName: '', // 小区名称
+  discoveryTime: '', // 发现时间
+  hiddenDangerLevel: '', // 隐患等级
+  responsibleManagementEnterprise: '', // 责任管理企业
+  personInCharge: '', // 责任人
+  plannedEliminationTimeLimit: '', // 计划消除时限
+  governanceSituation: '', // 治理情况
+  eliminationTime: '', // 消除时间
+  propertyRightNature: '', // 产权性质
+  remark: '', // 备注
+  occupiedEnterprisePersonalName: '', // 占压企业/个人名称
+  occupationUnitProperty: '', // 占压单位性质
+  dateOfConstructionOfTheOccupation: '', // 占压物建成年份
+  anyApprovalDocumentsForTheConstruction: '', // 有无占压物批准文件
+  useOfTheOccupation: '', // 占压物用途
+  descriptionOfTheOccupation: '', // 占压物描述
+  areThereRegularStaffActivities: '', // 有无经常性人员活动
+  areaOfOccupation: '', // 占压物面积
+  whetherThereAreConditionsForRelocation: '', // 占压物面积
+  yearOfUse: '', // 年代类别
+  yearOfCommencementOfOperation: '', // 年份
+  isThereAnyPipelineConstructionApprovalDocument: '', // 有无建设批准文件
+  pipelineDepth: '', // 管线埋深
+  pipeDiameter: '', // 管径
+  linePressure: '', // 管线压力
+  pipelineLength: '', // 占压管线长度
+  whetherItIsIncludedInTheTechnicalReformPlan: '', // 是否纳入技改计划
+  technicalTransformationProjectNumber: '', // 技改项目号
+  preventionAndControlMeasures: '', // 防控措施
+  governancePlan: '', // 治理计划
+  purchaseRestrictionOrGasShutdown: '', // 限购或停气情况
+  nameOfTheDiversionProject: '', // 改线工程名称
+  numberOfTheDiversionProject: '', // 改线工程编号
+  progressStatisticsOfTheDiversionProject: '', // 改线进度统计
+  contactPerson: '', // 与区县对接联系人
+  superOccupyingPressureClassification: '', // 特级占压分类情况
 }) // 表单
 const rules: FormRules = {
+  hiddenDangerNumber: [{ required: true, message: '隐患编号必填', trigger: ['blur', 'change'] }],
+  primaryClassification: [{ required: true, message: '一级分类必填', trigger: ['blur', 'change'] }],
+  secondaryClassification: [{ required: true, message: '二级分类必填', trigger: ['blur', 'change'] }],
+  hiddenDangerDescription: [{ required: true, message: '隐患描述必填', trigger: ['blur', 'change'] }],
+  pipeNetworkType: [{ required: true, message: '管网类型必填', trigger: ['blur', 'change'] }],
+  equipmentNumber: [{ required: true, message: '编码必填', trigger: ['blur', 'change'] }],
+  location: [{ required: true, message: '地点必填', trigger: ['blur', 'change'] }],
+  discoveryTime: [{ required: true, message: '发现时间必选', trigger: ['blur', 'change'] }],
+  hiddenDangerLevel: [{ required: true, message: '隐患等级必选', trigger: ['blur', 'change'] }],
+  responsibleManagementEnterprise: [{ required: true, message: '责任管理企业必填', trigger: ['blur', 'change'] }],
+  personInCharge: [{ required: true, message: '责任人必填', trigger: ['blur', 'change'] }],
+  governanceSituation: [{ required: true, message: '治理情况必填', trigger: ['blur', 'change'] }],
 } // 前端校验规则
-// 获取处置原因
-const cancelReasonList = ref<{ name: string;value: string;id: string }[]>()
+// 获取字典
+const whetherItIsInTheCommunity = ref<{ name: string;value: string;id: string }[]>() // 是否在小区内
+const hiddenDangerLevel = ref<{ name: string;value: string;id: string }[]>() // 隐患等级
 const fetchDict = () => {
-  getDictByCode('alarmHandlerReason').then((res) => {
-    cancelReasonList.value = res.data
+  getDictByCode('isAlarm').then((res) => {
+    whetherItIsInTheCommunity.value = res.data
+  })
+  getDictByCode('hiddenDangerLevel').then((res) => {
+    hiddenDangerLevel.value = res.data
   })
 }
 fetchDict()
-// 初始化对话框
-const initDialog = (type: string, row: any) => {
-  dialogFormVisible.value = true
-  dialogFormTyle.value = type
-  areaForm.value = row
+
+// 重置
+const resetForm = () => {
+  areaForm.value
+  for (const i in areaForm.value) {
+    areaForm.value[i] = ''
+  }
+  nextTick(() => {
+    dataFormRef.value?.clearValidate()
+  })
 }
-defineExpose({
-  initDialog,
-})
 // 取消
 const cancel = () => {
+  resetForm()
   dialogFormVisible.value = false
 }
+// 保存数据
+const saveData = () => {
+  // addHole
+  // editHole
+  (dialogFormTyle.value === 'create' ? addOver : editOver)(areaForm.value).then((res) => {
+    ElMessage.success('操作成功')
+    emits('refresh')
+    resetForm()
+    dialogFormVisible.value = false
+  })
+}
+// 确认
+const confirm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      if (valid) {
+        saveData()
+      }
+    }
+  })
+}
 // 地图选点
 const mapRef = ref()
 const selectMap = () => {
-  mapRef.value.initDialog()
+  mapRef.value.initDialog([areaForm.value.longitude, areaForm.value.latitude])
 }
 const confirmMap = (location: any) => {
   console.log(location, '选择的位置')
+  areaForm.value.longitude = location[0]
+  areaForm.value.latitude = location[1]
 }
+// 初始化对话框
+const initDialog = (type: string, row: any) => {
+  dialogFormVisible.value = true
+  dialogFormTyle.value = type
+  areaForm.value = JSON.parse(JSON.stringify(row))
+  if (type === 'create') {
+    resetForm()
+  }
+}
+defineExpose({
+  initDialog,
+})
 </script>
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="typeDict[dialogFormTyle]" append-to-body width="65%" top="10vh">
     <!-- 地图选点 -->
     <map-dialog ref="mapRef" @confirm="confirmMap" />
-    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
+    <el-form ref="dataFormRef" :class="[dialogFormTyle === 'detail' ? 'isDetail' : '']" :disabled="dialogFormTyle === 'detail'" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="序号">
-            <el-input v-model.trim="areaForm.couplingCode" type="text" />
+            <el-input v-model.trim="areaForm.serialNumber" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="隐患编号" disabled>
-            <el-input v-model.trim="areaForm.couplingTime" type="text" />
+          <el-form-item label="隐患编号" prop="hiddenDangerNumber">
+            <el-input v-model.trim="areaForm.hiddenDangerNumber" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="一级分类" disabled>
-            <el-input v-model.trim="areaForm.couplingTime" type="text" />
+          <el-form-item label="一级分类" prop="primaryClassification">
+            <el-input v-model.trim="areaForm.primaryClassification" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
-          <el-form-item label="二级分类">
-            <el-input v-model.trim="areaForm.couplingResult" type="text" />
+          <el-form-item label="二级分类" prop="secondaryClassification">
+            <el-input v-model.trim="areaForm.secondaryClassification" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="16">
-          <el-form-item label="隐患描述">
-            <el-input v-model.trim="areaForm.loglat" type="text" />
+          <el-form-item label="隐患描述" prop="hiddenDangerDescription">
+            <el-input v-model.trim="areaForm.hiddenDangerDescription" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
-          <el-form-item label="管网类型">
-            <el-input v-model.trim="areaForm.recognitionLevel" type="text" />
+          <el-form-item label="管网类型" prop="pipeNetworkType">
+            <el-input v-model.trim="areaForm.pipeNetworkType" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="管网、设备编码">
-            <el-input v-model.trim="areaForm.recognitionValue" type="text" />
+          <el-form-item label="管网、设备编码" prop="equipmentNumber">
+            <el-input v-model.trim="areaForm.equipmentNumber" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="所在区县">
-            <el-input v-model.trim="areaForm.recognitionValue" type="text" />
+          <el-form-item label="地点" prop="location">
+            <el-input v-model.trim="areaForm.location" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="24">
+      <!-- <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="所在街乡">
             <el-input v-model.trim="areaForm.holeLeve" type="text" />
@@ -111,19 +214,19 @@
             <el-input v-model.trim="areaForm.holeValue" type="text" />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="经度">
-            <el-input v-model.trim="areaForm.overstockLeve" type="text" />
+            <el-input v-model.trim="areaForm.longitude" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="纬度">
-            <el-input v-model.trim="areaForm.overstockValue" type="text" />
+            <el-input v-model.trim="areaForm.latitude" type="text" />
           </el-form-item>
         </el-col>
-        <el-col :span="4">
+        <el-col v-if="dialogFormTyle !== 'detail'" :span="4">
           <div style="margin-left: 15px;" class="icon-map" @click="selectMap">
             <el-tooltip
               class="box-item"
@@ -139,56 +242,63 @@
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="是否在小区内">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <!-- <el-input v-model.trim="areaForm.whetherItIsInTheCommunity" type="text" /> -->
+            <el-select v-model="areaForm.whetherItIsInTheCommunity" class="short-input" clearable style="width: 100%;">
+              <el-option v-for="item in whetherItIsInTheCommunity" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="小区内占压类型">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.occupyingType" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="小区名称">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.communityName" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
-          <el-form-item label="发现时间">
+          <el-form-item label="发现时间" prop="discoveryTime">
             <el-date-picker
-              v-model="value1"
+              v-model="areaForm.discoveryTime"
               type="datetime"
-              placeholder="发现时间"
               style="width: 100%;"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD HH:mm:ss"
             />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="隐患等级">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+          <el-form-item label="隐患等级" prop="hiddenDangerLevel">
+            <!-- <el-input v-model.trim="areaForm.gasValue" type="text" /> -->
+            <el-select v-model="areaForm.hiddenDangerLevel" class="short-input" clearable style="width: 100%;">
+              <el-option v-for="item in hiddenDangerLevel" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="管理责任企业">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+          <el-form-item label="管理责任企业" prop="responsibleManagementEnterprise">
+            <el-input v-model.trim="areaForm.responsibleManagementEnterprise" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
-          <el-form-item label="责任人">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+          <el-form-item label="责任人" prop="personInCharge">
+            <el-input v-model.trim="areaForm.personInCharge" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="计划消除时限">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+          <el-form-item label="计划消除时限" prop="plannedEliminationTimeLimit">
+            <el-input v-model.trim="areaForm.plannedEliminationTimeLimit" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="治理情况">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+          <el-form-item label="治理情况" prop="governanceSituation">
+            <el-input v-model.trim="areaForm.governanceSituation" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -196,178 +306,203 @@
         <el-col :span="8">
           <el-form-item label="消除时间">
             <el-date-picker
-              v-model="value1"
+              v-model="areaForm.eliminationTime"
               type="datetime"
-              placeholder="消除时间"
               style="width: 100%;"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD HH:mm:ss"
             />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="产权性质">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.propertyRightNature" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="备注">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.remark" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="占压企业/个人名称">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.occupiedEnterprisePersonalName" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压单位性质">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.occupationUnitProperty" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压物建成年代">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.dateOfConstructionOfTheOccupation" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="有无占压物建设批准文件">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <!-- <el-input v-model.trim="areaForm." type="text" /> -->
+            <el-select v-model="areaForm.anyApprovalDocumentsForTheConstruction" class="short-input" clearable style="width: 100%;">
+              <el-option label="有" value="1" />
+              <el-option label="无" value="0" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压物用途">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.useOfTheOccupation" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压物描述">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.descriptionOfTheOccupation" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="有无经常性人员活动">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.areThereRegularStaffActivities" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压物面积(m²)">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.areaOfOccupation" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="是否具备改移条件">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <!-- <el-input v-model.trim="areaForm.whetherThereAreConditionsForRelocation" type="text" /> -->
+            <el-select v-model="areaForm.whetherThereAreConditionsForRelocation" class="short-input" clearable style="width: 100%;">
+              <el-option v-for="item in whetherItIsInTheCommunity" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="年代">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.yearOfCommencementOfOperation" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="类别">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.yearOfUse" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="有无管线建设批准文件">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <!-- <el-input v-model.trim="areaForm.isThereAnyPipelineConstructionApprovalDocument" type="text" /> -->
+            <el-select v-model="areaForm.isThereAnyPipelineConstructionApprovalDocument" class="short-input" clearable style="width: 100%;">
+              <el-option label="有" value="1" />
+              <el-option label="无" value="0" />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="管线埋深(m)">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.pipelineDepth" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="管径">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.pipeDiameter" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="管线压力">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.linePressure" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="占压管线长度(m)">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.pipelineLength" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="是否纳入技改计划">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <!-- <el-input v-model.trim="areaForm.whetherItIsIncludedInTheTechnicalReformPlan" type="text" /> -->
+            <el-select v-model="areaForm.whetherItIsIncludedInTheTechnicalReformPlan" class="short-input" clearable style="width: 100%;">
+              <el-option v-for="item in whetherItIsInTheCommunity" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="技改项目号">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.technicalTransformationProjectNumber" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="防控措施">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.preventionAndControlMeasures" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="治理计划">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.governancePlan" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="限购或停气情况">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.purchaseRestrictionOrGasShutdown" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="改线工程名称">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.nameOfTheDiversionProject" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="改线工程编号">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.numberOfTheDiversionProject" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="改线进展统计">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.progressStatisticsOfTheDiversionProject" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="与区县对接联系人">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.contactPerson" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="特级占压分类情况">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.superOccupyingPressureClassification" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="cancel">
-          确认
-        </el-button>
+        <div v-if="dialogFormTyle !== 'detail'">
+          <el-button type="primary" @click="confirm(dataFormRef)">
+            确认
+          </el-button>
+          <el-button type="info" @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
@@ -389,3 +524,15 @@
 }
 </style>
 
+<style lang="scss" scoped>
+// 样式
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/main/database/index.vue b/src/views/main/database/index.vue
index eece6ad..231b94c 100644
--- a/src/views/main/database/index.vue
+++ b/src/views/main/database/index.vue
@@ -1,20 +1,25 @@
 <!-- 管线占压数据管理 -->
 <script name="DatabaseManage" setup lang="ts">
-import { getCurrentInstance, onMounted, ref, watch } from 'vue'
-import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { DateModelType } from 'element-plus'
 import detailDialog from './detail.vue'
 import type { dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { batchDeleteOver, exporOver, getOverListPage, importOver, templateOver } from '@/api/page/database'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 
 // 查询条件
 const listQuery = ref({
-  recognitionCode: '', // 第三方code
+  hiddenDangerNumber: '', // 隐患编号
+  primaryClassification: '', // 一级分类
+  secondaryClassification: '', // 二级分类
+  hiddenDangerDescription: '', // 隐患描述
+  hiddenDangerLevel: '', // 隐患等级
+  responsibleManagementEnterprise: '', // 管理责任企业
+  discoveryTime: '', // 发现时间
+  governanceSituation: '', // 治理
   offset: 1,
   limit: 20,
 })
@@ -22,36 +27,22 @@
 const loadingTable = ref(false) // 表格loading
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '序号', value: 'recognitionCode', align: 'center', width: '160' },
-  { text: '隐患编号', value: 'recognitionType', align: 'center' },
-  { text: '一级分类', value: 'recognitionTime', align: 'center' },
-  { text: '二级分类', value: 'loglat', align: 'center' },
-  { text: '地点', value: 'position', align: 'center' },
-  { text: '发现时间', value: 'recognitionPrecision', align: 'center' },
-  { text: '隐患等级', value: 'recognitionLevel', align: 'center' },
-  { text: '管理责任企业', value: 'taskName', align: 'center' },
-  { text: '责任人', value: 'taskName', align: 'center' },
-  { text: '治理情况', value: 'taskName', align: 'center' },
-  { text: '消除时间', value: 'taskName', align: 'center' },
+  { text: '序号', value: 'serialNumber', align: 'center' },
+  { text: '隐患编号', value: 'hiddenDangerNumber', align: 'center' },
+  { text: '一级分类', value: 'primaryClassification', align: 'center' },
+  { text: '二级分类', value: 'secondaryClassification', align: 'center' },
+  { text: '地点', value: 'location', align: 'center' },
+  { text: '发现时间', value: 'discoveryTime', align: 'center' },
+  { text: '隐患等级', value: 'hiddenDangerLevel', align: 'center' },
+  { text: '管理责任企业', value: 'responsibleManagementEnterprise', align: 'center' },
+  { text: '责任人', value: 'personInCharge', align: 'center' },
+  { text: '治理情况', value: 'governanceSituation', align: 'center' },
+  { text: '消除时间', value: 'eliminationTime', align: 'center' },
 ])
 const list = ref([]) // 表格数据
-// 筛选时间段数据
-const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
-// 时间变更
-watch(dateRange, (val) => {
-  if (val) {
-    listQuery.value.beginDate = `${val[0]}`
-    listQuery.value.endDate = `${val[1]}`
-  }
-  else {
-    listQuery.value.beginDate = ''
-    listQuery.value.endDate = ''
-  }
-})
-
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -59,15 +50,19 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getIdentifyListPage(listQuery.value).then((res) => {
-  //   console.log(res.data, '第三方')
-  //   list.value = res.data.rows
-  //   total.value = parseInt(res.data.total)
-  //   loadingTable.value = false
-  // }).catch(() => {
-  list.value = [{}]
-  loadingTable.value = false
-  // })
+  getOverListPage(listQuery.value).then((res) => {
+    console.log(res.data, '管线占压')
+    list.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        eliminationTime: item.eliminationTime ? item.eliminationTime : '/',
+      }
+    })
+    total.value = parseInt(res.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 // 搜索
 const searchList = () => {
@@ -77,17 +72,17 @@
 // 重置
 const reset = () => {
   listQuery.value = {
-    alarmCode: '', // 报警编号
-    beginDate: '', // 报警开始时间
-    endDate: '', // 报警结束时间
-    alarmType: '1',
-    taskName: '', // 巡检任务名称
-    // position: '', // 报警位置
-    alarmStatus: '', // 报警状态
+    hiddenDangerNumber: '', // 隐患编号
+    primaryClassification: '', // 一级分类
+    secondaryClassification: '', // 二级分类
+    hiddenDangerDescription: '', // 隐患描述
+    hiddenDangerLevel: '', // 隐患等级
+    responsibleManagementEnterprise: '', // 管理责任企业
+    discoveryTime: '', // 发现时间
+    governanceSituation: '', // 治理
     offset: 1,
     limit: 20,
   }
-  dateRange.value = ['', ''] // 时间清空
   fetchData(true)
 }
 
@@ -98,19 +93,72 @@
 
 // 导出
 const exportList = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择需要导出的数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (list.value.length > 0) {
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
+  exportOver({ ids: checkoutList.value }).then((res) => {
+    exportFile(res.data, '管线占压数据列表.xlsx')
+    loading.close()
+  }).catch(() => {
+    loading.close()
+  })
 }
-
+// 导入
+const importRef = ref()
+const importList = () => {
+  importRef.value.click()
+}
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('file', event.target.files[0])
+    // fd.append('equipmentType', $props.equipmentType)
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    importOver(fd).then((res) => {
+      // 清空上传缓存
+      importRef.value.value = ''
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+        loading.close()
+        fetchData(true)
+      }
+      else {
+        loading.close()
+      }
+    }).catch(() => {
+      // 清空上传缓存
+      importRef.value.value = ''
+      loading.close()
+    })
+  }
+}
+// 删除
+const deleteList = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择需要删除的数据')
+    return
+  }
+  batchDeleteOver({ ids: checkoutList.value }).then((res) => {
+    ElMessage.success('操作成功')
+    fetchData(true)
+  })
+}
+// 模板下载
+const templateDownload = () => {
+  templateHole({}).then((res) => {
+    exportFile(res.data, '地下空洞模板')
+  })
+}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -127,18 +175,17 @@
 const handler = (type: string, row: any) => {
   handlerRef.value.initDialog(type, row)
 }
-// 处置报警
-const alarmRef = ref()
-const handlerAlarm = (row: IList) => {
-  alarmRef.value.initDialog(row)
-}
-const alarmStatusMap = ref<dictType[]>([]) // 报警状态
 
+const hiddenDangerLevelList = ref<dictType[]>([]) // 隐患等级
+const governanceSituationList = ref<dictType[]>([]) // 是否治理
 // 查询字典
 const getDict = async () => {
   // 巡检状态
-  getDictByCode('alarmStatus').then((response) => {
-    alarmStatusMap.value = response.data
+  getDictByCode('hiddenDangerLevel').then((response) => {
+    hiddenDangerLevelList.value = response.data
+  })
+  getDictByCode('isAlarm').then((response) => {
+    governanceSituationList.value = response.data
   })
 }
 
@@ -152,11 +199,11 @@
   <!-- 布局 -->
   <app-container>
     <!-- 编辑操作 -->
-    <detail-dialog ref="handlerRef" />
+    <detail-dialog ref="handlerRef" @refresh="searchList" />
     <search-area :need-clear="true" @search="searchList" @clear="reset">
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.hiddenDangerNumber"
           placeholder="隐患编号"
           class="short-input"
           clearable
@@ -164,7 +211,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.primaryClassification"
           placeholder="一级分类"
           class="short-input"
           clearable
@@ -172,7 +219,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.secondaryClassification"
           placeholder="二级分类"
           class="short-input"
           clearable
@@ -180,20 +227,20 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.hiddenDangerDescription"
           placeholder="隐患描述"
           class="short-input"
           clearable
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.alarmStatus" class="short-input" placeholder="隐患等级" clearable>
-          <el-option v-for="item in alarmStatusMap" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.hiddenDangerLevel" class="short-input" placeholder="隐患等级" clearable>
+          <el-option v-for="item in hiddenDangerLevelList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.responsibleManagementEnterprise"
           placeholder="管理责任公司"
           class="short-input"
           clearable
@@ -201,24 +248,27 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.value1"
+          v-model="listQuery.discoveryTime"
           type="date"
           placeholder="发现时间"
           style="width: 100%;"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD HH:mm:ss"
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.alarmStatus" class="short-input" placeholder="是否进行治理" clearable>
-          <el-option v-for="item in alarmStatusMap" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.governanceSituation" class="short-input" placeholder="是否进行治理" clearable>
+          <el-option v-for="item in governanceSituationList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新增" type="primary" @click="handler('create', {})" />
-        <icon-button icon="icon-delete" title="删除" type="primary" />
-        <icon-button icon="icon-template" title="模板下载" type="primary" />
-        <icon-button icon="icon-import" title="导入" type="primary" />
+        <icon-button icon="icon-delete" title="删除" type="primary" @click="deleteList" />
+        <icon-button icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
+        <icon-button icon="icon-import" title="导入" type="primary" @click="importList" />
+        <input ref="importRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
       </template>
       <normal-table
@@ -226,7 +276,7 @@
         is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="#" width="55" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/main/database/mapDialog.vue b/src/views/main/database/mapDialog.vue
index 3ed2919..c8e554e 100644
--- a/src/views/main/database/mapDialog.vue
+++ b/src/views/main/database/mapDialog.vue
@@ -7,7 +7,14 @@
 // const mapRef = ref()
 // const zoom = ref(18)
 // 初始化对话框
+const init = ref<any[]>([])
 const initDialog = (data: any) => {
+  if (data[0] && data[1]) {
+    init.value = [Number(data[0]), Number(data[1])]
+  }
+  else {
+    init.value = []
+  }
   dialogFormVisible.value = true
 }
 defineExpose({
@@ -32,7 +39,7 @@
   <el-dialog v-model="dialogFormVisible" title="地图选点" append-to-body width="50%">
     <div class="container">
       <!-- <map-component ref="mapRef" :zoom="zoom" /> -->
-      <marker-map @confirm="selectMarker" />
+      <marker-map v-if="dialogFormVisible" :init="init" @confirm="selectMarker" />
     </div>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/main/undergroundCavity/detail.vue b/src/views/main/undergroundCavity/detail.vue
new file mode 100644
index 0000000..4db2e56
--- /dev/null
+++ b/src/views/main/undergroundCavity/detail.vue
@@ -0,0 +1,288 @@
+<!-- 地下空洞详情 -->
+<script lang="ts" setup name="GanDetail">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import uploadFile from './upload.vue'
+import mapDialog from '@/views/main/database/mapDialog.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { addHole, detailHole, editHole } from '@/api/page/undergroundCavity'
+const emits = defineEmits(['refresh'])
+const dataFormRef = ref()
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogFormTyle = ref('create')
+const typeDict = ref<{ [key: string]: string }>({
+  create: '新建',
+  update: '编辑',
+  detail: '详情',
+})
+const areaForm = ref({
+  abnormolWave: '', // 异常波形
+  detectionDistance: '', // 探测距离
+  holeSize: '', // 空洞大小
+  holeType: '', // 空洞类型
+  holePicture: '', // 空洞图片
+  detectionTime: '', // 探测时间
+  riskLevel: '', // 风险等级
+  lnglat: '', // 经纬度
+  longitude: '', // 经度
+  latitude: '', // 纬度
+  position: '', // 空洞位置
+  isHandle: '', // 是否进行治理
+}) // 表单
+const rules: FormRules = {
+  abnormolWave: [{ required: true, message: '异常波形必填', trigger: ['blur', 'change'] }],
+  detectionDistance: [{ required: true, message: '探测距离必填', trigger: ['blur', 'change'] }],
+  holeSize: [{ required: true, message: '空洞大小必填', trigger: ['blur', 'change'] }],
+  holeType: [{ required: true, message: '空洞类型必填', trigger: ['blur', 'change'] }],
+  // holePicture: [{ required: true, message: '空洞图片必须上传', trigger: ['blur', 'change'] }],
+  detectionTime: [{ required: true, message: '探测时间必选', trigger: ['blur', 'change'] }],
+  riskLevel: [{ required: true, message: '风险等级必选', trigger: ['blur', 'change'] }],
+  position: [{ required: true, message: '空洞位置必填', trigger: ['blur', 'change'] }],
+} // 前端校验规则
+// 字典
+const riskLevelList = ref<{ name: string;value: string;id: string }[]>() // 风险等级
+const handlerList = ref<{ name: string;value: string;id: string }[]>([]) // 是否治理
+const fetchDict = () => {
+  getDictByCode('holeRiskLevel').then((res) => {
+    riskLevelList.value = res.data
+  })
+  getDictByCode('isAlarm').then((response) => {
+    handlerList.value = response.data
+  })
+}
+fetchDict()
+// 重置
+const resetForm = () => {
+  areaForm.value = {
+    abnormolWave: '', // 异常波形
+    detectionDistance: '', // 探测距离
+    holeSize: '', // 空洞大小
+    holeType: '', // 空洞类型
+    holePicture: '', // 空洞图片
+    detectionTime: '', // 探测时间
+    riskLevel: '', // 风险等级
+    lnglat: '', // 经纬度
+    longitude: '', // 经度
+    latitude: '', // 纬度
+    position: '', // 空洞位置
+    isHandle: '', // 是否进行治理
+  }
+  nextTick(() => {
+    dataFormRef.value?.clearValidate()
+  })
+}
+// 取消
+const cancel = () => {
+  resetForm()
+  dialogFormVisible.value = false
+}
+
+// 保存数据
+const saveData = () => {
+  // addHole
+  // editHole
+  (dialogFormTyle.value === 'create' ? addHole : editHole)(areaForm.value).then((res) => {
+    ElMessage.success('操作成功')
+    emits('refresh')
+    resetForm()
+    dialogFormVisible.value = false
+  })
+}
+// 确认
+const confirm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      if (valid) {
+        saveData()
+      }
+    }
+  })
+}
+// 地图选点
+const mapRef = ref()
+const selectMap = () => {
+  mapRef.value.initDialog([areaForm.value.longitude, areaForm.value.latitude])
+}
+const confirmMap = (location: any) => {
+  console.log(location, '选择的位置')
+  areaForm.value.longitude = location[0]
+  areaForm.value.latitude = location[1]
+  areaForm.value.lnglat = location.join()
+}
+// 初始化对话框
+const initDialog = (type: string, row: any) => {
+  dialogFormVisible.value = true
+  dialogFormTyle.value = type
+  areaForm.value = JSON.parse(JSON.stringify(row))
+  if (type === 'create') {
+    resetForm()
+  }
+}
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" :title="typeDict[dialogFormTyle]" append-to-body width="35%">
+    <!-- 地图选点 -->
+    <map-dialog ref="mapRef" @confirm="confirmMap" />
+    <el-form ref="dataFormRef" :class="[dialogFormTyle === 'detail' ? 'isDetail' : '']" :rules="rules" :model="areaForm" label-position="right" label-width="120px" :disabled="dialogFormTyle === 'detail'">
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="异常波形" prop="abnormolWave">
+            <el-input v-model.trim="areaForm.abnormolWave" type="text" placeholder="异常波形" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="探测距离" prop="detectionDistance">
+            <el-input v-model.trim="areaForm.detectionDistance" type="text" placeholder="探测距离" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="空洞大小" prop="holeSize">
+            <el-input v-model.trim="areaForm.holeSize" type="text" placeholder="空洞大小" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="空洞类型" prop="holeType">
+            <el-input v-model.trim="areaForm.holeType" type="text" placeholder="空洞类型" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <!-- <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="空洞图片" prop="holePicture">
+            <upload-file v-model.trim="areaForm.holePicture" />
+          </el-form-item>
+        </el-col>
+      </el-row> -->
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="探测时间" prop="detectionTime">
+            <el-date-picker
+              v-model="areaForm.detectionTime"
+              type="date"
+              placeholder="探测时间"
+              style="width: 100%;"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD HH:mm:ss"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="风险等级" prop="riskLevel">
+            <el-select v-model="areaForm.riskLevel" class="short-input" placeholder="风险等级" clearable style="width: 100%;">
+              <el-option v-for="item in riskLevelList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="空洞经纬度" prop="lnglat">
+            <el-input v-model.trim="areaForm.lnglat" type="text" placeholder="空洞经纬度" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="dialogFormTyle !== 'detail'" :span="4">
+          <div style="margin-left: 15px;" class="icon-map" @click="selectMap">
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              content="地图选点"
+              placement="top"
+            >
+              <svg-icon name="icon-xunjian" style="width: 35px;height: 35px;" />
+            </el-tooltip>
+          </div>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="空洞位置" prop="position">
+            <el-input v-model.trim="areaForm.position" type="textarea" maxlength="100" show-word-limit :rows="2" placeholder="空洞位置" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="是否进行治理">
+            <el-select v-model="areaForm.isHandle" class="short-input" placeholder="是否进行治理" clearable style="width: 100%;">
+              <el-option v-for="item in handlerList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <!-- <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="治理描述">
+            <el-input v-model.trim="areaForm.gasLevel" type="textarea" show-word-limit :rows="3" maxlength="100" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="备注">
+            <el-input v-model.trim="areaForm.gasLevel" type="textarea" show-word-limit :rows="3" maxlength="100" />
+          </el-form-item>
+        </el-col>
+      </el-row> -->
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <div v-if="dialogFormTyle !== 'detail'">
+          <el-button type="primary" @click="confirm(dataFormRef)">
+            确认
+          </el-button>
+          <el-button type="info" @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.icon-map {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
+
+<style lang="scss" scoped>
+// 样式
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+</style>
+
diff --git a/src/views/main/undergroundCavity/index.vue b/src/views/main/undergroundCavity/index.vue
index 56c87bb..e724683 100644
--- a/src/views/main/undergroundCavity/index.vue
+++ b/src/views/main/undergroundCavity/index.vue
@@ -1,19 +1,26 @@
 <!-- 地下空洞管理 -->
 <script name="UndergroundCavity" setup lang="ts">
-import { getCurrentInstance, onMounted, ref, watch } from 'vue'
-import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { DateModelType } from 'element-plus'
+import detailDialog from './detail.vue'
 import type { dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { batchDeleteHole, exportHole, getHoleListPage, importHole, templateHole } from '@/api/page/undergroundCavity'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 
 // 查询条件
 const listQuery = ref({
-  recognitionCode: '', // 第三方code
+  holeCode: '', // 空洞编号
+  abnormolWave: '', // 异常波形
+  detectionDistance: '', // 探测距离
+  holeSize: '', // 空洞大小
+  holeType: '', // 空洞类型
+  detectionTime: '', // 探测时间
+  riskLevel: '', // 风险等级
+  position: '', // 空洞位置
+  isHandle: '', // 是否进行治理
   offset: 1,
   limit: 20,
 })
@@ -21,36 +28,21 @@
 const loadingTable = ref(false) // 表格loading
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '地下空洞编号', value: 'recognitionCode', align: 'center', width: '160' },
-  { text: '异常波形', value: 'recognitionType', align: 'center' },
-  { text: '探测距离', value: 'recognitionTime', align: 'center' },
-  { text: '空洞大小', value: 'loglat', align: 'center' },
-  { text: '空洞类型', value: 'position', align: 'center' },
-  { text: '空洞图片', value: 'recognitionPrecision', align: 'center' },
-  { text: '探测时间', value: 'recognitionLevel', align: 'center' },
-  { text: '风险等级', value: 'taskName', align: 'center' },
-  { text: '空洞经纬度', value: 'taskName', align: 'center' },
-  { text: '空洞位置', value: 'taskName', align: 'center' },
-  { text: '是否进行治理', value: 'taskName', align: 'center' },
+  { text: '地下空洞编号', value: 'holeCode', align: 'center', width: '160' },
+  { text: '异常波形', value: 'abnormolWave', align: 'center' },
+  { text: '探测距离', value: 'detectionDistance', align: 'center' },
+  { text: '空洞大小', value: 'holeSize', align: 'center' },
+  { text: '空洞类型', value: 'holeType', align: 'center' },
+  // { text: '空洞图片', value: 'holePicture', align: 'center' },
+  { text: '探测时间', value: 'detectionTime', align: 'center' },
+  { text: '风险等级', value: 'riskLevel', align: 'center' },
+  { text: '空洞经纬度', value: 'lnglat', align: 'center' },
+  { text: '空洞位置', value: 'position', align: 'center' },
+  { text: '是否进行治理', value: 'isHandle', align: 'center' },
 ])
 const list = ref([]) // 表格数据
-// 筛选时间段数据
-const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
-// 时间变更
-watch(dateRange, (val) => {
-  if (val) {
-    listQuery.value.beginDate = `${val[0]}`
-    listQuery.value.endDate = `${val[1]}`
-  }
-  else {
-    listQuery.value.beginDate = ''
-    listQuery.value.endDate = ''
-  }
-})
-
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -58,15 +50,20 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getIdentifyListPage(listQuery.value).then((res) => {
-  //   console.log(res.data, '第三方')
-  //   list.value = res.data.rows
-  //   total.value = parseInt(res.data.total)
-  //   loadingTable.value = false
-  // }).catch(() => {
-  list.value = [{}]
-  loadingTable.value = false
-  // })
+  getHoleListPage(listQuery.value).then((res) => {
+    console.log(res.data, '地下空洞')
+    list.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        lnglat: `${item.longitude},${item.latitude}`,
+        isHandle: item.isHandle === '1' ? '是' : '否',
+      }
+    })
+    total.value = parseInt(res.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 // 搜索
 const searchList = () => {
@@ -76,17 +73,18 @@
 // 重置
 const reset = () => {
   listQuery.value = {
-    alarmCode: '', // 报警编号
-    beginDate: '', // 报警开始时间
-    endDate: '', // 报警结束时间
-    alarmType: '1',
-    taskName: '', // 巡检任务名称
-    // position: '', // 报警位置
-    alarmStatus: '', // 报警状态
+    holeCode: '', // 空洞编号
+    abnormolWave: '', // 异常波形
+    detectionDistance: '', // 探测距离
+    holeSize: '', // 空洞大小
+    holeType: '', // 空洞类型
+    detectionTime: '', // 探测时间
+    riskLevel: '', // 风险等级
+    position: '', // 空洞位置
+    isHandle: '', // 是否进行治理
     offset: 1,
     limit: 20,
   }
-  dateRange.value = ['', ''] // 时间清空
   fetchData(true)
 }
 
@@ -97,19 +95,72 @@
 
 // 导出
 const exportList = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择需要导出的数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (list.value.length > 0) {
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
+  exportHole({ ids: checkoutList.value }).then((res) => {
+    exportFile(res.data, '地下空洞列表.xlsx')
+    loading.close()
+  }).catch(() => {
+    loading.close()
+  })
 }
-
+// 删除
+const deleteList = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择需要删除的数据')
+    return
+  }
+  batchDeleteHole({ ids: checkoutList.value }).then((res) => {
+    ElMessage.success('操作成功')
+    fetchData(true)
+  })
+}
+// 模板下载
+const templateDownload = () => {
+  templateHole({}).then((res) => {
+    exportFile(res.data, '地下空洞模板')
+  })
+}
+// 导入
+const importRef = ref()
+const importList = () => {
+  importRef.value.click()
+}
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('file', event.target.files[0])
+    // fd.append('equipmentType', $props.equipmentType)
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    importHole(fd).then((res) => {
+      // 清空上传缓存
+      importRef.value.value = ''
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+        loading.close()
+        fetchData(true)
+      }
+      else {
+        loading.close()
+      }
+    }).catch(() => {
+      // 清空上传缓存
+      importRef.value.value = ''
+      loading.close()
+    })
+  }
+}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -124,21 +175,19 @@
 // 详情
 const detailRef = ref()
 const handler = (type: string, row: any) => {
-  // $router.push({ path: `/gasAlarm/${pageType}/${row.id}` })
-  detailRef.value.initDialog(row)
+  detailRef.value.initDialog(type, row)
 }
-// 处置报警
-const alarmRef = ref()
-const handlerAlarm = (row: IList) => {
-  alarmRef.value.initDialog(row)
-}
-const alarmStatusMap = ref<dictType[]>([]) // 报警状态
 
 // 查询字典
+const riskLevelList = ref<dictType[]>([]) // 风险等级
+const handlerList = ref<dictType[]>([]) // 是否治理
 const getDict = async () => {
-  // 巡检状态
-  getDictByCode('alarmStatus').then((response) => {
-    alarmStatusMap.value = response.data
+  // 风险等级
+  getDictByCode('holeRiskLevel').then((response) => {
+    riskLevelList.value = response.data
+  })
+  getDictByCode('isAlarm').then((response) => {
+    handlerList.value = response.data
   })
 }
 
@@ -152,9 +201,11 @@
   <!-- 布局 -->
   <app-container>
     <search-area :need-clear="true" @search="searchList" @clear="reset">
+      <!-- 编辑弹窗 -->
+      <detail-dialog ref="detailRef" @refresh="searchList" />
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.holeCode"
           placeholder="地下空洞编号"
           class="short-input"
           clearable
@@ -162,7 +213,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.abnormolWave"
           placeholder="异常波形"
           class="short-input"
           clearable
@@ -170,7 +221,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.detectionDistance"
           placeholder="探测距离"
           class="short-input"
           clearable
@@ -178,7 +229,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.holeSize"
           placeholder="空洞大小"
           class="short-input"
           clearable
@@ -186,7 +237,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.holeType"
           placeholder="空洞类型"
           class="short-input"
           clearable
@@ -194,37 +245,40 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.value1"
+          v-model="listQuery.detectionTime"
           type="date"
           placeholder="探测时间"
           style="width: 100%;"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD HH:mm:ss"
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.alarmStatus" class="short-input" placeholder="风险等级" clearable>
-          <el-option v-for="item in alarmStatusMap" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.riskLevel" class="short-input" placeholder="风险等级" clearable>
+          <el-option v-for="item in riskLevelList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.position"
           placeholder="空洞位置"
           class="short-input"
           clearable
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.alarmStatus" class="short-input" placeholder="是否进行治理" clearable>
-          <el-option v-for="item in alarmStatusMap" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.isHandle" class="short-input" placeholder="是否进行治理" clearable>
+          <el-option v-for="item in handlerList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新增" type="primary" @click="handler('create', {})" />
-        <icon-button icon="icon-delete" title="删除" type="primary" />
-        <icon-button icon="icon-template" title="模板下载" type="primary" />
-        <icon-button icon="icon-import" title="导入" type="primary" />
+        <icon-button icon="icon-delete" title="删除" type="primary" @click="deleteList" />
+        <icon-button icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
+        <icon-button icon="icon-import" title="导入" type="primary" @click="importList" />
+        <input ref="importRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
       </template>
       <normal-table

diff --git a/src/api/common.ts b/src/api/common.ts
new file mode 100644
index 0000000..cdfffe6
--- /dev/null
+++ b/src/api/common.ts
@@ -0,0 +1,16 @@
+import request from './index'
+// 获取文件地址
+export function getFileUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
+// 上传文件
+export function uploadFile(data: FormData) {
+  return request({
+    url: 'minio/file/upload',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/page/database.ts b/src/api/page/database.ts
new file mode 100644
index 0000000..7715aa5
--- /dev/null
+++ b/src/api/page/database.ts
@@ -0,0 +1,62 @@
+/**
+ * 管线占压相关接口
+ */
+import request from '../index'
+// 列表查询
+export function getOverListPage(params: any) {
+  return request({
+    url: `/system/busPipeOverstock/listPage?offset=${params.offset}&limit=${params.limit}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 导出
+export function exporOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/export',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 删除
+export function batchDeleteOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/delete',
+    method: 'post',
+    data: params,
+  })
+}
+// 模板下载
+export function templateOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/template',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 导入
+export function importOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/import',
+    method: 'post',
+    data: params,
+  })
+}
+// 新建
+export function addOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/add',
+    method: 'post',
+    data: params,
+  })
+}
+// 编辑
+export function editOver(params: any) {
+  return request({
+    url: '/system/busPipeOverstock/edit',
+    method: 'post',
+    data: params,
+  })
+}
diff --git a/src/api/page/undergroundCavity.TS b/src/api/page/undergroundCavity.TS
new file mode 100644
index 0000000..afd0c20
--- /dev/null
+++ b/src/api/page/undergroundCavity.TS
@@ -0,0 +1,70 @@
+/**
+ * 地下空洞相关接口
+ */
+import request from '../index'
+// 列表查询
+export function getHoleListPage(params: any) {
+  return request({
+    url: `/system/busHole/listPage?offset=${params.offset}&limit=${params.limit}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 新建
+export function addHole(params: any) {
+  return request({
+    url: '/system/busHole/add',
+    method: 'post',
+    data: params,
+  })
+}
+// 编辑
+export function editHole(params: any) {
+  return request({
+    url: '/system/busHole/edit',
+    method: 'post',
+    data: params,
+  })
+}
+// 详情
+export function detailHole(params: any) {
+  return request({
+    url: '/system/busHole/detail',
+    method: 'post',
+    data: params,
+  })
+}
+// 导出
+export function exportHole(params: any) {
+  return request({
+    url: '/system/busHole/export',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 删除
+export function batchDeleteHole(params: any) {
+  return request({
+    url: '/system/busHole/delete',
+    method: 'post',
+    data: params,
+  })
+}
+// 模板下载
+export function templateHole(params: any) {
+  return request({
+    url: '/system/busHole/template',
+    method: 'post',
+    data: params,
+    responseType: 'blob',
+  })
+}
+// 导入
+export function importHole(params: any) {
+  return request({
+    url: '/system/busHole/import',
+    method: 'post',
+    data: params,
+  })
+}
diff --git a/src/views/main/database/detail.vue b/src/views/main/database/detail.vue
index 31d6a63..a798fc6 100644
--- a/src/views/main/database/detail.vue
+++ b/src/views/main/database/detail.vue
@@ -1,10 +1,10 @@
 <!-- 管线占压详情 -->
 <script lang="ts" setup name="GanDetail">
-import type { FormRules } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import mapDialog from './mapDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
-// import { getGasDetail } from '@/api/page/gas'
+import { addOver, editOver } from '@/api/page/database'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -14,93 +14,196 @@
   update: '编辑',
   detail: '详情',
 })
-const areaForm = ref({
+const areaForm = ref<{ [key: string]: string }>({
+  serialNumber: '', // 序号
+  hiddenDangerNumber: '', // 隐患标号
+  primaryClassification: '', // 一级分类
+  secondaryClassification: '', // 二级分类
+  hiddenDangerDescription: '', // 隐患描述
+  pipeNetworkType: '', // 管网类型
+  equipmentNumber: '', // 编码
+  location: '', // 地点
+  longitude: '', // 经度
+  latitude: '', // 纬度
+  whetherItIsInTheCommunity: '', // 是否在小区内
+  occupyingType: '', // 小区内占压类型
+  communityName: '', // 小区名称
+  discoveryTime: '', // 发现时间
+  hiddenDangerLevel: '', // 隐患等级
+  responsibleManagementEnterprise: '', // 责任管理企业
+  personInCharge: '', // 责任人
+  plannedEliminationTimeLimit: '', // 计划消除时限
+  governanceSituation: '', // 治理情况
+  eliminationTime: '', // 消除时间
+  propertyRightNature: '', // 产权性质
+  remark: '', // 备注
+  occupiedEnterprisePersonalName: '', // 占压企业/个人名称
+  occupationUnitProperty: '', // 占压单位性质
+  dateOfConstructionOfTheOccupation: '', // 占压物建成年份
+  anyApprovalDocumentsForTheConstruction: '', // 有无占压物批准文件
+  useOfTheOccupation: '', // 占压物用途
+  descriptionOfTheOccupation: '', // 占压物描述
+  areThereRegularStaffActivities: '', // 有无经常性人员活动
+  areaOfOccupation: '', // 占压物面积
+  whetherThereAreConditionsForRelocation: '', // 占压物面积
+  yearOfUse: '', // 年代类别
+  yearOfCommencementOfOperation: '', // 年份
+  isThereAnyPipelineConstructionApprovalDocument: '', // 有无建设批准文件
+  pipelineDepth: '', // 管线埋深
+  pipeDiameter: '', // 管径
+  linePressure: '', // 管线压力
+  pipelineLength: '', // 占压管线长度
+  whetherItIsIncludedInTheTechnicalReformPlan: '', // 是否纳入技改计划
+  technicalTransformationProjectNumber: '', // 技改项目号
+  preventionAndControlMeasures: '', // 防控措施
+  governancePlan: '', // 治理计划
+  purchaseRestrictionOrGasShutdown: '', // 限购或停气情况
+  nameOfTheDiversionProject: '', // 改线工程名称
+  numberOfTheDiversionProject: '', // 改线工程编号
+  progressStatisticsOfTheDiversionProject: '', // 改线进度统计
+  contactPerson: '', // 与区县对接联系人
+  superOccupyingPressureClassification: '', // 特级占压分类情况
 }) // 表单
 const rules: FormRules = {
+  hiddenDangerNumber: [{ required: true, message: '隐患编号必填', trigger: ['blur', 'change'] }],
+  primaryClassification: [{ required: true, message: '一级分类必填', trigger: ['blur', 'change'] }],
+  secondaryClassification: [{ required: true, message: '二级分类必填', trigger: ['blur', 'change'] }],
+  hiddenDangerDescription: [{ required: true, message: '隐患描述必填', trigger: ['blur', 'change'] }],
+  pipeNetworkType: [{ required: true, message: '管网类型必填', trigger: ['blur', 'change'] }],
+  equipmentNumber: [{ required: true, message: '编码必填', trigger: ['blur', 'change'] }],
+  location: [{ required: true, message: '地点必填', trigger: ['blur', 'change'] }],
+  discoveryTime: [{ required: true, message: '发现时间必选', trigger: ['blur', 'change'] }],
+  hiddenDangerLevel: [{ required: true, message: '隐患等级必选', trigger: ['blur', 'change'] }],
+  responsibleManagementEnterprise: [{ required: true, message: '责任管理企业必填', trigger: ['blur', 'change'] }],
+  personInCharge: [{ required: true, message: '责任人必填', trigger: ['blur', 'change'] }],
+  governanceSituation: [{ required: true, message: '治理情况必填', trigger: ['blur', 'change'] }],
 } // 前端校验规则
-// 获取处置原因
-const cancelReasonList = ref<{ name: string;value: string;id: string }[]>()
+// 获取字典
+const whetherItIsInTheCommunity = ref<{ name: string;value: string;id: string }[]>() // 是否在小区内
+const hiddenDangerLevel = ref<{ name: string;value: string;id: string }[]>() // 隐患等级
 const fetchDict = () => {
-  getDictByCode('alarmHandlerReason').then((res) => {
-    cancelReasonList.value = res.data
+  getDictByCode('isAlarm').then((res) => {
+    whetherItIsInTheCommunity.value = res.data
+  })
+  getDictByCode('hiddenDangerLevel').then((res) => {
+    hiddenDangerLevel.value = res.data
   })
 }
 fetchDict()
-// 初始化对话框
-const initDialog = (type: string, row: any) => {
-  dialogFormVisible.value = true
-  dialogFormTyle.value = type
-  areaForm.value = row
+
+// 重置
+const resetForm = () => {
+  areaForm.value
+  for (const i in areaForm.value) {
+    areaForm.value[i] = ''
+  }
+  nextTick(() => {
+    dataFormRef.value?.clearValidate()
+  })
 }
-defineExpose({
-  initDialog,
-})
 // 取消
 const cancel = () => {
+  resetForm()
   dialogFormVisible.value = false
 }
+// 保存数据
+const saveData = () => {
+  // addHole
+  // editHole
+  (dialogFormTyle.value === 'create' ? addOver : editOver)(areaForm.value).then((res) => {
+    ElMessage.success('操作成功')
+    emits('refresh')
+    resetForm()
+    dialogFormVisible.value = false
+  })
+}
+// 确认
+const confirm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      if (valid) {
+        saveData()
+      }
+    }
+  })
+}
 // 地图选点
 const mapRef = ref()
 const selectMap = () => {
-  mapRef.value.initDialog()
+  mapRef.value.initDialog([areaForm.value.longitude, areaForm.value.latitude])
 }
 const confirmMap = (location: any) => {
   console.log(location, '选择的位置')
+  areaForm.value.longitude = location[0]
+  areaForm.value.latitude = location[1]
 }
+// 初始化对话框
+const initDialog = (type: string, row: any) => {
+  dialogFormVisible.value = true
+  dialogFormTyle.value = type
+  areaForm.value = JSON.parse(JSON.stringify(row))
+  if (type === 'create') {
+    resetForm()
+  }
+}
+defineExpose({
+  initDialog,
+})
 </script>
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="typeDict[dialogFormTyle]" append-to-body width="65%" top="10vh">
     <!-- 地图选点 -->
     <map-dialog ref="mapRef" @confirm="confirmMap" />
-    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
+    <el-form ref="dataFormRef" :class="[dialogFormTyle === 'detail' ? 'isDetail' : '']" :disabled="dialogFormTyle === 'detail'" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="序号">
-            <el-input v-model.trim="areaForm.couplingCode" type="text" />
+            <el-input v-model.trim="areaForm.serialNumber" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="隐患编号" disabled>
-            <el-input v-model.trim="areaForm.couplingTime" type="text" />
+          <el-form-item label="隐患编号" prop="hiddenDangerNumber">
+            <el-input v-model.trim="areaForm.hiddenDangerNumber" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="一级分类" disabled>
-            <el-input v-model.trim="areaForm.couplingTime" type="text" />
+          <el-form-item label="一级分类" prop="primaryClassification">
+            <el-input v-model.trim="areaForm.primaryClassification" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
-          <el-form-item label="二级分类">
-            <el-input v-model.trim="areaForm.couplingResult" type="text" />
+          <el-form-item label="二级分类" prop="secondaryClassification">
+            <el-input v-model.trim="areaForm.secondaryClassification" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="16">
-          <el-form-item label="隐患描述">
-            <el-input v-model.trim="areaForm.loglat" type="text" />
+          <el-form-item label="隐患描述" prop="hiddenDangerDescription">
+            <el-input v-model.trim="areaForm.hiddenDangerDescription" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
-          <el-form-item label="管网类型">
-            <el-input v-model.trim="areaForm.recognitionLevel" type="text" />
+          <el-form-item label="管网类型" prop="pipeNetworkType">
+            <el-input v-model.trim="areaForm.pipeNetworkType" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="管网、设备编码">
-            <el-input v-model.trim="areaForm.recognitionValue" type="text" />
+          <el-form-item label="管网、设备编码" prop="equipmentNumber">
+            <el-input v-model.trim="areaForm.equipmentNumber" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="所在区县">
-            <el-input v-model.trim="areaForm.recognitionValue" type="text" />
+          <el-form-item label="地点" prop="location">
+            <el-input v-model.trim="areaForm.location" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="24">
+      <!-- <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="所在街乡">
             <el-input v-model.trim="areaForm.holeLeve" type="text" />
@@ -111,19 +214,19 @@
             <el-input v-model.trim="areaForm.holeValue" type="text" />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="经度">
-            <el-input v-model.trim="areaForm.overstockLeve" type="text" />
+            <el-input v-model.trim="areaForm.longitude" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="纬度">
-            <el-input v-model.trim="areaForm.overstockValue" type="text" />
+            <el-input v-model.trim="areaForm.latitude" type="text" />
           </el-form-item>
         </el-col>
-        <el-col :span="4">
+        <el-col v-if="dialogFormTyle !== 'detail'" :span="4">
           <div style="margin-left: 15px;" class="icon-map" @click="selectMap">
             <el-tooltip
               class="box-item"
@@ -139,56 +242,63 @@
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="是否在小区内">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <!-- <el-input v-model.trim="areaForm.whetherItIsInTheCommunity" type="text" /> -->
+            <el-select v-model="areaForm.whetherItIsInTheCommunity" class="short-input" clearable style="width: 100%;">
+              <el-option v-for="item in whetherItIsInTheCommunity" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="小区内占压类型">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.occupyingType" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="小区名称">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.communityName" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
-          <el-form-item label="发现时间">
+          <el-form-item label="发现时间" prop="discoveryTime">
             <el-date-picker
-              v-model="value1"
+              v-model="areaForm.discoveryTime"
               type="datetime"
-              placeholder="发现时间"
               style="width: 100%;"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD HH:mm:ss"
             />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="隐患等级">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+          <el-form-item label="隐患等级" prop="hiddenDangerLevel">
+            <!-- <el-input v-model.trim="areaForm.gasValue" type="text" /> -->
+            <el-select v-model="areaForm.hiddenDangerLevel" class="short-input" clearable style="width: 100%;">
+              <el-option v-for="item in hiddenDangerLevel" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="管理责任企业">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+          <el-form-item label="管理责任企业" prop="responsibleManagementEnterprise">
+            <el-input v-model.trim="areaForm.responsibleManagementEnterprise" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
-          <el-form-item label="责任人">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+          <el-form-item label="责任人" prop="personInCharge">
+            <el-input v-model.trim="areaForm.personInCharge" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="计划消除时限">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+          <el-form-item label="计划消除时限" prop="plannedEliminationTimeLimit">
+            <el-input v-model.trim="areaForm.plannedEliminationTimeLimit" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="治理情况">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+          <el-form-item label="治理情况" prop="governanceSituation">
+            <el-input v-model.trim="areaForm.governanceSituation" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -196,178 +306,203 @@
         <el-col :span="8">
           <el-form-item label="消除时间">
             <el-date-picker
-              v-model="value1"
+              v-model="areaForm.eliminationTime"
               type="datetime"
-              placeholder="消除时间"
               style="width: 100%;"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD HH:mm:ss"
             />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="产权性质">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.propertyRightNature" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="备注">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.remark" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="占压企业/个人名称">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.occupiedEnterprisePersonalName" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压单位性质">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.occupationUnitProperty" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压物建成年代">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.dateOfConstructionOfTheOccupation" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="有无占压物建设批准文件">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <!-- <el-input v-model.trim="areaForm." type="text" /> -->
+            <el-select v-model="areaForm.anyApprovalDocumentsForTheConstruction" class="short-input" clearable style="width: 100%;">
+              <el-option label="有" value="1" />
+              <el-option label="无" value="0" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压物用途">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.useOfTheOccupation" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压物描述">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.descriptionOfTheOccupation" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="有无经常性人员活动">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.areThereRegularStaffActivities" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="占压物面积(m²)">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.areaOfOccupation" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="是否具备改移条件">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <!-- <el-input v-model.trim="areaForm.whetherThereAreConditionsForRelocation" type="text" /> -->
+            <el-select v-model="areaForm.whetherThereAreConditionsForRelocation" class="short-input" clearable style="width: 100%;">
+              <el-option v-for="item in whetherItIsInTheCommunity" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="年代">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.yearOfCommencementOfOperation" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="类别">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.yearOfUse" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="有无管线建设批准文件">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <!-- <el-input v-model.trim="areaForm.isThereAnyPipelineConstructionApprovalDocument" type="text" /> -->
+            <el-select v-model="areaForm.isThereAnyPipelineConstructionApprovalDocument" class="short-input" clearable style="width: 100%;">
+              <el-option label="有" value="1" />
+              <el-option label="无" value="0" />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="管线埋深(m)">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.pipelineDepth" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="管径">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.pipeDiameter" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="管线压力">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.linePressure" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="占压管线长度(m)">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.pipelineLength" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="是否纳入技改计划">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <!-- <el-input v-model.trim="areaForm.whetherItIsIncludedInTheTechnicalReformPlan" type="text" /> -->
+            <el-select v-model="areaForm.whetherItIsIncludedInTheTechnicalReformPlan" class="short-input" clearable style="width: 100%;">
+              <el-option v-for="item in whetherItIsInTheCommunity" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="技改项目号">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.technicalTransformationProjectNumber" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="防控措施">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.preventionAndControlMeasures" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="治理计划">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.governancePlan" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="限购或停气情况">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.purchaseRestrictionOrGasShutdown" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="改线工程名称">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.nameOfTheDiversionProject" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="改线工程编号">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.numberOfTheDiversionProject" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="改线进展统计">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.progressStatisticsOfTheDiversionProject" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="与区县对接联系人">
-            <el-input v-model.trim="areaForm.gasLevel" type="text" />
+            <el-input v-model.trim="areaForm.contactPerson" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="特级占压分类情况">
-            <el-input v-model.trim="areaForm.gasValue" type="text" />
+            <el-input v-model.trim="areaForm.superOccupyingPressureClassification" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="cancel">
-          确认
-        </el-button>
+        <div v-if="dialogFormTyle !== 'detail'">
+          <el-button type="primary" @click="confirm(dataFormRef)">
+            确认
+          </el-button>
+          <el-button type="info" @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
       </div>
     </template>
   </el-dialog>
@@ -389,3 +524,15 @@
 }
 </style>
 
+<style lang="scss" scoped>
+// 样式
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/main/database/index.vue b/src/views/main/database/index.vue
index eece6ad..231b94c 100644
--- a/src/views/main/database/index.vue
+++ b/src/views/main/database/index.vue
@@ -1,20 +1,25 @@
 <!-- 管线占压数据管理 -->
 <script name="DatabaseManage" setup lang="ts">
-import { getCurrentInstance, onMounted, ref, watch } from 'vue'
-import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { DateModelType } from 'element-plus'
 import detailDialog from './detail.vue'
 import type { dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { batchDeleteOver, exporOver, getOverListPage, importOver, templateOver } from '@/api/page/database'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 
 // 查询条件
 const listQuery = ref({
-  recognitionCode: '', // 第三方code
+  hiddenDangerNumber: '', // 隐患编号
+  primaryClassification: '', // 一级分类
+  secondaryClassification: '', // 二级分类
+  hiddenDangerDescription: '', // 隐患描述
+  hiddenDangerLevel: '', // 隐患等级
+  responsibleManagementEnterprise: '', // 管理责任企业
+  discoveryTime: '', // 发现时间
+  governanceSituation: '', // 治理
   offset: 1,
   limit: 20,
 })
@@ -22,36 +27,22 @@
 const loadingTable = ref(false) // 表格loading
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '序号', value: 'recognitionCode', align: 'center', width: '160' },
-  { text: '隐患编号', value: 'recognitionType', align: 'center' },
-  { text: '一级分类', value: 'recognitionTime', align: 'center' },
-  { text: '二级分类', value: 'loglat', align: 'center' },
-  { text: '地点', value: 'position', align: 'center' },
-  { text: '发现时间', value: 'recognitionPrecision', align: 'center' },
-  { text: '隐患等级', value: 'recognitionLevel', align: 'center' },
-  { text: '管理责任企业', value: 'taskName', align: 'center' },
-  { text: '责任人', value: 'taskName', align: 'center' },
-  { text: '治理情况', value: 'taskName', align: 'center' },
-  { text: '消除时间', value: 'taskName', align: 'center' },
+  { text: '序号', value: 'serialNumber', align: 'center' },
+  { text: '隐患编号', value: 'hiddenDangerNumber', align: 'center' },
+  { text: '一级分类', value: 'primaryClassification', align: 'center' },
+  { text: '二级分类', value: 'secondaryClassification', align: 'center' },
+  { text: '地点', value: 'location', align: 'center' },
+  { text: '发现时间', value: 'discoveryTime', align: 'center' },
+  { text: '隐患等级', value: 'hiddenDangerLevel', align: 'center' },
+  { text: '管理责任企业', value: 'responsibleManagementEnterprise', align: 'center' },
+  { text: '责任人', value: 'personInCharge', align: 'center' },
+  { text: '治理情况', value: 'governanceSituation', align: 'center' },
+  { text: '消除时间', value: 'eliminationTime', align: 'center' },
 ])
 const list = ref([]) // 表格数据
-// 筛选时间段数据
-const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
-// 时间变更
-watch(dateRange, (val) => {
-  if (val) {
-    listQuery.value.beginDate = `${val[0]}`
-    listQuery.value.endDate = `${val[1]}`
-  }
-  else {
-    listQuery.value.beginDate = ''
-    listQuery.value.endDate = ''
-  }
-})
-
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -59,15 +50,19 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getIdentifyListPage(listQuery.value).then((res) => {
-  //   console.log(res.data, '第三方')
-  //   list.value = res.data.rows
-  //   total.value = parseInt(res.data.total)
-  //   loadingTable.value = false
-  // }).catch(() => {
-  list.value = [{}]
-  loadingTable.value = false
-  // })
+  getOverListPage(listQuery.value).then((res) => {
+    console.log(res.data, '管线占压')
+    list.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        eliminationTime: item.eliminationTime ? item.eliminationTime : '/',
+      }
+    })
+    total.value = parseInt(res.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 // 搜索
 const searchList = () => {
@@ -77,17 +72,17 @@
 // 重置
 const reset = () => {
   listQuery.value = {
-    alarmCode: '', // 报警编号
-    beginDate: '', // 报警开始时间
-    endDate: '', // 报警结束时间
-    alarmType: '1',
-    taskName: '', // 巡检任务名称
-    // position: '', // 报警位置
-    alarmStatus: '', // 报警状态
+    hiddenDangerNumber: '', // 隐患编号
+    primaryClassification: '', // 一级分类
+    secondaryClassification: '', // 二级分类
+    hiddenDangerDescription: '', // 隐患描述
+    hiddenDangerLevel: '', // 隐患等级
+    responsibleManagementEnterprise: '', // 管理责任企业
+    discoveryTime: '', // 发现时间
+    governanceSituation: '', // 治理
     offset: 1,
     limit: 20,
   }
-  dateRange.value = ['', ''] // 时间清空
   fetchData(true)
 }
 
@@ -98,19 +93,72 @@
 
 // 导出
 const exportList = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择需要导出的数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (list.value.length > 0) {
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
+  exportOver({ ids: checkoutList.value }).then((res) => {
+    exportFile(res.data, '管线占压数据列表.xlsx')
+    loading.close()
+  }).catch(() => {
+    loading.close()
+  })
 }
-
+// 导入
+const importRef = ref()
+const importList = () => {
+  importRef.value.click()
+}
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('file', event.target.files[0])
+    // fd.append('equipmentType', $props.equipmentType)
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    importOver(fd).then((res) => {
+      // 清空上传缓存
+      importRef.value.value = ''
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+        loading.close()
+        fetchData(true)
+      }
+      else {
+        loading.close()
+      }
+    }).catch(() => {
+      // 清空上传缓存
+      importRef.value.value = ''
+      loading.close()
+    })
+  }
+}
+// 删除
+const deleteList = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择需要删除的数据')
+    return
+  }
+  batchDeleteOver({ ids: checkoutList.value }).then((res) => {
+    ElMessage.success('操作成功')
+    fetchData(true)
+  })
+}
+// 模板下载
+const templateDownload = () => {
+  templateHole({}).then((res) => {
+    exportFile(res.data, '地下空洞模板')
+  })
+}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -127,18 +175,17 @@
 const handler = (type: string, row: any) => {
   handlerRef.value.initDialog(type, row)
 }
-// 处置报警
-const alarmRef = ref()
-const handlerAlarm = (row: IList) => {
-  alarmRef.value.initDialog(row)
-}
-const alarmStatusMap = ref<dictType[]>([]) // 报警状态
 
+const hiddenDangerLevelList = ref<dictType[]>([]) // 隐患等级
+const governanceSituationList = ref<dictType[]>([]) // 是否治理
 // 查询字典
 const getDict = async () => {
   // 巡检状态
-  getDictByCode('alarmStatus').then((response) => {
-    alarmStatusMap.value = response.data
+  getDictByCode('hiddenDangerLevel').then((response) => {
+    hiddenDangerLevelList.value = response.data
+  })
+  getDictByCode('isAlarm').then((response) => {
+    governanceSituationList.value = response.data
   })
 }
 
@@ -152,11 +199,11 @@
   <!-- 布局 -->
   <app-container>
     <!-- 编辑操作 -->
-    <detail-dialog ref="handlerRef" />
+    <detail-dialog ref="handlerRef" @refresh="searchList" />
     <search-area :need-clear="true" @search="searchList" @clear="reset">
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.hiddenDangerNumber"
           placeholder="隐患编号"
           class="short-input"
           clearable
@@ -164,7 +211,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.primaryClassification"
           placeholder="一级分类"
           class="short-input"
           clearable
@@ -172,7 +219,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.secondaryClassification"
           placeholder="二级分类"
           class="short-input"
           clearable
@@ -180,20 +227,20 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.hiddenDangerDescription"
           placeholder="隐患描述"
           class="short-input"
           clearable
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.alarmStatus" class="short-input" placeholder="隐患等级" clearable>
-          <el-option v-for="item in alarmStatusMap" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.hiddenDangerLevel" class="short-input" placeholder="隐患等级" clearable>
+          <el-option v-for="item in hiddenDangerLevelList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.responsibleManagementEnterprise"
           placeholder="管理责任公司"
           class="short-input"
           clearable
@@ -201,24 +248,27 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.value1"
+          v-model="listQuery.discoveryTime"
           type="date"
           placeholder="发现时间"
           style="width: 100%;"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD HH:mm:ss"
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.alarmStatus" class="short-input" placeholder="是否进行治理" clearable>
-          <el-option v-for="item in alarmStatusMap" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.governanceSituation" class="short-input" placeholder="是否进行治理" clearable>
+          <el-option v-for="item in governanceSituationList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新增" type="primary" @click="handler('create', {})" />
-        <icon-button icon="icon-delete" title="删除" type="primary" />
-        <icon-button icon="icon-template" title="模板下载" type="primary" />
-        <icon-button icon="icon-import" title="导入" type="primary" />
+        <icon-button icon="icon-delete" title="删除" type="primary" @click="deleteList" />
+        <icon-button icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
+        <icon-button icon="icon-import" title="导入" type="primary" @click="importList" />
+        <input ref="importRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
       </template>
       <normal-table
@@ -226,7 +276,7 @@
         is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="#" width="55" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/main/database/mapDialog.vue b/src/views/main/database/mapDialog.vue
index 3ed2919..c8e554e 100644
--- a/src/views/main/database/mapDialog.vue
+++ b/src/views/main/database/mapDialog.vue
@@ -7,7 +7,14 @@
 // const mapRef = ref()
 // const zoom = ref(18)
 // 初始化对话框
+const init = ref<any[]>([])
 const initDialog = (data: any) => {
+  if (data[0] && data[1]) {
+    init.value = [Number(data[0]), Number(data[1])]
+  }
+  else {
+    init.value = []
+  }
   dialogFormVisible.value = true
 }
 defineExpose({
@@ -32,7 +39,7 @@
   <el-dialog v-model="dialogFormVisible" title="地图选点" append-to-body width="50%">
     <div class="container">
       <!-- <map-component ref="mapRef" :zoom="zoom" /> -->
-      <marker-map @confirm="selectMarker" />
+      <marker-map v-if="dialogFormVisible" :init="init" @confirm="selectMarker" />
     </div>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/main/undergroundCavity/detail.vue b/src/views/main/undergroundCavity/detail.vue
new file mode 100644
index 0000000..4db2e56
--- /dev/null
+++ b/src/views/main/undergroundCavity/detail.vue
@@ -0,0 +1,288 @@
+<!-- 地下空洞详情 -->
+<script lang="ts" setup name="GanDetail">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import uploadFile from './upload.vue'
+import mapDialog from '@/views/main/database/mapDialog.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { addHole, detailHole, editHole } from '@/api/page/undergroundCavity'
+const emits = defineEmits(['refresh'])
+const dataFormRef = ref()
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogFormTyle = ref('create')
+const typeDict = ref<{ [key: string]: string }>({
+  create: '新建',
+  update: '编辑',
+  detail: '详情',
+})
+const areaForm = ref({
+  abnormolWave: '', // 异常波形
+  detectionDistance: '', // 探测距离
+  holeSize: '', // 空洞大小
+  holeType: '', // 空洞类型
+  holePicture: '', // 空洞图片
+  detectionTime: '', // 探测时间
+  riskLevel: '', // 风险等级
+  lnglat: '', // 经纬度
+  longitude: '', // 经度
+  latitude: '', // 纬度
+  position: '', // 空洞位置
+  isHandle: '', // 是否进行治理
+}) // 表单
+const rules: FormRules = {
+  abnormolWave: [{ required: true, message: '异常波形必填', trigger: ['blur', 'change'] }],
+  detectionDistance: [{ required: true, message: '探测距离必填', trigger: ['blur', 'change'] }],
+  holeSize: [{ required: true, message: '空洞大小必填', trigger: ['blur', 'change'] }],
+  holeType: [{ required: true, message: '空洞类型必填', trigger: ['blur', 'change'] }],
+  // holePicture: [{ required: true, message: '空洞图片必须上传', trigger: ['blur', 'change'] }],
+  detectionTime: [{ required: true, message: '探测时间必选', trigger: ['blur', 'change'] }],
+  riskLevel: [{ required: true, message: '风险等级必选', trigger: ['blur', 'change'] }],
+  position: [{ required: true, message: '空洞位置必填', trigger: ['blur', 'change'] }],
+} // 前端校验规则
+// 字典
+const riskLevelList = ref<{ name: string;value: string;id: string }[]>() // 风险等级
+const handlerList = ref<{ name: string;value: string;id: string }[]>([]) // 是否治理
+const fetchDict = () => {
+  getDictByCode('holeRiskLevel').then((res) => {
+    riskLevelList.value = res.data
+  })
+  getDictByCode('isAlarm').then((response) => {
+    handlerList.value = response.data
+  })
+}
+fetchDict()
+// 重置
+const resetForm = () => {
+  areaForm.value = {
+    abnormolWave: '', // 异常波形
+    detectionDistance: '', // 探测距离
+    holeSize: '', // 空洞大小
+    holeType: '', // 空洞类型
+    holePicture: '', // 空洞图片
+    detectionTime: '', // 探测时间
+    riskLevel: '', // 风险等级
+    lnglat: '', // 经纬度
+    longitude: '', // 经度
+    latitude: '', // 纬度
+    position: '', // 空洞位置
+    isHandle: '', // 是否进行治理
+  }
+  nextTick(() => {
+    dataFormRef.value?.clearValidate()
+  })
+}
+// 取消
+const cancel = () => {
+  resetForm()
+  dialogFormVisible.value = false
+}
+
+// 保存数据
+const saveData = () => {
+  // addHole
+  // editHole
+  (dialogFormTyle.value === 'create' ? addHole : editHole)(areaForm.value).then((res) => {
+    ElMessage.success('操作成功')
+    emits('refresh')
+    resetForm()
+    dialogFormVisible.value = false
+  })
+}
+// 确认
+const confirm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      if (valid) {
+        saveData()
+      }
+    }
+  })
+}
+// 地图选点
+const mapRef = ref()
+const selectMap = () => {
+  mapRef.value.initDialog([areaForm.value.longitude, areaForm.value.latitude])
+}
+const confirmMap = (location: any) => {
+  console.log(location, '选择的位置')
+  areaForm.value.longitude = location[0]
+  areaForm.value.latitude = location[1]
+  areaForm.value.lnglat = location.join()
+}
+// 初始化对话框
+const initDialog = (type: string, row: any) => {
+  dialogFormVisible.value = true
+  dialogFormTyle.value = type
+  areaForm.value = JSON.parse(JSON.stringify(row))
+  if (type === 'create') {
+    resetForm()
+  }
+}
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" :title="typeDict[dialogFormTyle]" append-to-body width="35%">
+    <!-- 地图选点 -->
+    <map-dialog ref="mapRef" @confirm="confirmMap" />
+    <el-form ref="dataFormRef" :class="[dialogFormTyle === 'detail' ? 'isDetail' : '']" :rules="rules" :model="areaForm" label-position="right" label-width="120px" :disabled="dialogFormTyle === 'detail'">
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="异常波形" prop="abnormolWave">
+            <el-input v-model.trim="areaForm.abnormolWave" type="text" placeholder="异常波形" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="探测距离" prop="detectionDistance">
+            <el-input v-model.trim="areaForm.detectionDistance" type="text" placeholder="探测距离" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="空洞大小" prop="holeSize">
+            <el-input v-model.trim="areaForm.holeSize" type="text" placeholder="空洞大小" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="空洞类型" prop="holeType">
+            <el-input v-model.trim="areaForm.holeType" type="text" placeholder="空洞类型" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <!-- <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="空洞图片" prop="holePicture">
+            <upload-file v-model.trim="areaForm.holePicture" />
+          </el-form-item>
+        </el-col>
+      </el-row> -->
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="探测时间" prop="detectionTime">
+            <el-date-picker
+              v-model="areaForm.detectionTime"
+              type="date"
+              placeholder="探测时间"
+              style="width: 100%;"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD HH:mm:ss"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="风险等级" prop="riskLevel">
+            <el-select v-model="areaForm.riskLevel" class="short-input" placeholder="风险等级" clearable style="width: 100%;">
+              <el-option v-for="item in riskLevelList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="空洞经纬度" prop="lnglat">
+            <el-input v-model.trim="areaForm.lnglat" type="text" placeholder="空洞经纬度" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="dialogFormTyle !== 'detail'" :span="4">
+          <div style="margin-left: 15px;" class="icon-map" @click="selectMap">
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              content="地图选点"
+              placement="top"
+            >
+              <svg-icon name="icon-xunjian" style="width: 35px;height: 35px;" />
+            </el-tooltip>
+          </div>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="空洞位置" prop="position">
+            <el-input v-model.trim="areaForm.position" type="textarea" maxlength="100" show-word-limit :rows="2" placeholder="空洞位置" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="是否进行治理">
+            <el-select v-model="areaForm.isHandle" class="short-input" placeholder="是否进行治理" clearable style="width: 100%;">
+              <el-option v-for="item in handlerList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <!-- <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="治理描述">
+            <el-input v-model.trim="areaForm.gasLevel" type="textarea" show-word-limit :rows="3" maxlength="100" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form-item label="备注">
+            <el-input v-model.trim="areaForm.gasLevel" type="textarea" show-word-limit :rows="3" maxlength="100" />
+          </el-form-item>
+        </el-col>
+      </el-row> -->
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <div v-if="dialogFormTyle !== 'detail'">
+          <el-button type="primary" @click="confirm(dataFormRef)">
+            确认
+          </el-button>
+          <el-button type="info" @click="cancel">
+            取消
+          </el-button>
+        </div>
+        <div v-else>
+          <el-button type="primary" @click="cancel">
+            确认
+          </el-button>
+        </div>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.icon-map {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
+
+<style lang="scss" scoped>
+// 样式
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+</style>
+
diff --git a/src/views/main/undergroundCavity/index.vue b/src/views/main/undergroundCavity/index.vue
index 56c87bb..e724683 100644
--- a/src/views/main/undergroundCavity/index.vue
+++ b/src/views/main/undergroundCavity/index.vue
@@ -1,19 +1,26 @@
 <!-- 地下空洞管理 -->
 <script name="UndergroundCavity" setup lang="ts">
-import { getCurrentInstance, onMounted, ref, watch } from 'vue'
-import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { DateModelType } from 'element-plus'
+import detailDialog from './detail.vue'
 import type { dictType } from '@/global'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { batchDeleteHole, exportHole, getHoleListPage, importHole, templateHole } from '@/api/page/undergroundCavity'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 
 // 查询条件
 const listQuery = ref({
-  recognitionCode: '', // 第三方code
+  holeCode: '', // 空洞编号
+  abnormolWave: '', // 异常波形
+  detectionDistance: '', // 探测距离
+  holeSize: '', // 空洞大小
+  holeType: '', // 空洞类型
+  detectionTime: '', // 探测时间
+  riskLevel: '', // 风险等级
+  position: '', // 空洞位置
+  isHandle: '', // 是否进行治理
   offset: 1,
   limit: 20,
 })
@@ -21,36 +28,21 @@
 const loadingTable = ref(false) // 表格loading
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '地下空洞编号', value: 'recognitionCode', align: 'center', width: '160' },
-  { text: '异常波形', value: 'recognitionType', align: 'center' },
-  { text: '探测距离', value: 'recognitionTime', align: 'center' },
-  { text: '空洞大小', value: 'loglat', align: 'center' },
-  { text: '空洞类型', value: 'position', align: 'center' },
-  { text: '空洞图片', value: 'recognitionPrecision', align: 'center' },
-  { text: '探测时间', value: 'recognitionLevel', align: 'center' },
-  { text: '风险等级', value: 'taskName', align: 'center' },
-  { text: '空洞经纬度', value: 'taskName', align: 'center' },
-  { text: '空洞位置', value: 'taskName', align: 'center' },
-  { text: '是否进行治理', value: 'taskName', align: 'center' },
+  { text: '地下空洞编号', value: 'holeCode', align: 'center', width: '160' },
+  { text: '异常波形', value: 'abnormolWave', align: 'center' },
+  { text: '探测距离', value: 'detectionDistance', align: 'center' },
+  { text: '空洞大小', value: 'holeSize', align: 'center' },
+  { text: '空洞类型', value: 'holeType', align: 'center' },
+  // { text: '空洞图片', value: 'holePicture', align: 'center' },
+  { text: '探测时间', value: 'detectionTime', align: 'center' },
+  { text: '风险等级', value: 'riskLevel', align: 'center' },
+  { text: '空洞经纬度', value: 'lnglat', align: 'center' },
+  { text: '空洞位置', value: 'position', align: 'center' },
+  { text: '是否进行治理', value: 'isHandle', align: 'center' },
 ])
 const list = ref([]) // 表格数据
-// 筛选时间段数据
-const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-
-// 时间变更
-watch(dateRange, (val) => {
-  if (val) {
-    listQuery.value.beginDate = `${val[0]}`
-    listQuery.value.endDate = `${val[1]}`
-  }
-  else {
-    listQuery.value.beginDate = ''
-    listQuery.value.endDate = ''
-  }
-})
-
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -58,15 +50,20 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getIdentifyListPage(listQuery.value).then((res) => {
-  //   console.log(res.data, '第三方')
-  //   list.value = res.data.rows
-  //   total.value = parseInt(res.data.total)
-  //   loadingTable.value = false
-  // }).catch(() => {
-  list.value = [{}]
-  loadingTable.value = false
-  // })
+  getHoleListPage(listQuery.value).then((res) => {
+    console.log(res.data, '地下空洞')
+    list.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        lnglat: `${item.longitude},${item.latitude}`,
+        isHandle: item.isHandle === '1' ? '是' : '否',
+      }
+    })
+    total.value = parseInt(res.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 // 搜索
 const searchList = () => {
@@ -76,17 +73,18 @@
 // 重置
 const reset = () => {
   listQuery.value = {
-    alarmCode: '', // 报警编号
-    beginDate: '', // 报警开始时间
-    endDate: '', // 报警结束时间
-    alarmType: '1',
-    taskName: '', // 巡检任务名称
-    // position: '', // 报警位置
-    alarmStatus: '', // 报警状态
+    holeCode: '', // 空洞编号
+    abnormolWave: '', // 异常波形
+    detectionDistance: '', // 探测距离
+    holeSize: '', // 空洞大小
+    holeType: '', // 空洞类型
+    detectionTime: '', // 探测时间
+    riskLevel: '', // 风险等级
+    position: '', // 空洞位置
+    isHandle: '', // 是否进行治理
     offset: 1,
     limit: 20,
   }
-  dateRange.value = ['', ''] // 时间清空
   fetchData(true)
 }
 
@@ -97,19 +95,72 @@
 
 // 导出
 const exportList = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择需要导出的数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (list.value.length > 0) {
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
+  exportHole({ ids: checkoutList.value }).then((res) => {
+    exportFile(res.data, '地下空洞列表.xlsx')
+    loading.close()
+  }).catch(() => {
+    loading.close()
+  })
 }
-
+// 删除
+const deleteList = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择需要删除的数据')
+    return
+  }
+  batchDeleteHole({ ids: checkoutList.value }).then((res) => {
+    ElMessage.success('操作成功')
+    fetchData(true)
+  })
+}
+// 模板下载
+const templateDownload = () => {
+  templateHole({}).then((res) => {
+    exportFile(res.data, '地下空洞模板')
+  })
+}
+// 导入
+const importRef = ref()
+const importList = () => {
+  importRef.value.click()
+}
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('file', event.target.files[0])
+    // fd.append('equipmentType', $props.equipmentType)
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    importHole(fd).then((res) => {
+      // 清空上传缓存
+      importRef.value.value = ''
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+        loading.close()
+        fetchData(true)
+      }
+      else {
+        loading.close()
+      }
+    }).catch(() => {
+      // 清空上传缓存
+      importRef.value.value = ''
+      loading.close()
+    })
+  }
+}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -124,21 +175,19 @@
 // 详情
 const detailRef = ref()
 const handler = (type: string, row: any) => {
-  // $router.push({ path: `/gasAlarm/${pageType}/${row.id}` })
-  detailRef.value.initDialog(row)
+  detailRef.value.initDialog(type, row)
 }
-// 处置报警
-const alarmRef = ref()
-const handlerAlarm = (row: IList) => {
-  alarmRef.value.initDialog(row)
-}
-const alarmStatusMap = ref<dictType[]>([]) // 报警状态
 
 // 查询字典
+const riskLevelList = ref<dictType[]>([]) // 风险等级
+const handlerList = ref<dictType[]>([]) // 是否治理
 const getDict = async () => {
-  // 巡检状态
-  getDictByCode('alarmStatus').then((response) => {
-    alarmStatusMap.value = response.data
+  // 风险等级
+  getDictByCode('holeRiskLevel').then((response) => {
+    riskLevelList.value = response.data
+  })
+  getDictByCode('isAlarm').then((response) => {
+    handlerList.value = response.data
   })
 }
 
@@ -152,9 +201,11 @@
   <!-- 布局 -->
   <app-container>
     <search-area :need-clear="true" @search="searchList" @clear="reset">
+      <!-- 编辑弹窗 -->
+      <detail-dialog ref="detailRef" @refresh="searchList" />
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.holeCode"
           placeholder="地下空洞编号"
           class="short-input"
           clearable
@@ -162,7 +213,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.abnormolWave"
           placeholder="异常波形"
           class="short-input"
           clearable
@@ -170,7 +221,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.detectionDistance"
           placeholder="探测距离"
           class="short-input"
           clearable
@@ -178,7 +229,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.holeSize"
           placeholder="空洞大小"
           class="short-input"
           clearable
@@ -186,7 +237,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.holeType"
           placeholder="空洞类型"
           class="short-input"
           clearable
@@ -194,37 +245,40 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.value1"
+          v-model="listQuery.detectionTime"
           type="date"
           placeholder="探测时间"
           style="width: 100%;"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD HH:mm:ss"
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.alarmStatus" class="short-input" placeholder="风险等级" clearable>
-          <el-option v-for="item in alarmStatusMap" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.riskLevel" class="short-input" placeholder="风险等级" clearable>
+          <el-option v-for="item in riskLevelList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.recognitionCode"
+          v-model.trim="listQuery.position"
           placeholder="空洞位置"
           class="short-input"
           clearable
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.alarmStatus" class="short-input" placeholder="是否进行治理" clearable>
-          <el-option v-for="item in alarmStatusMap" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.isHandle" class="short-input" placeholder="是否进行治理" clearable>
+          <el-option v-for="item in handlerList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新增" type="primary" @click="handler('create', {})" />
-        <icon-button icon="icon-delete" title="删除" type="primary" />
-        <icon-button icon="icon-template" title="模板下载" type="primary" />
-        <icon-button icon="icon-import" title="导入" type="primary" />
+        <icon-button icon="icon-delete" title="删除" type="primary" @click="deleteList" />
+        <icon-button icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
+        <icon-button icon="icon-import" title="导入" type="primary" @click="importList" />
+        <input ref="importRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
       </template>
       <normal-table
diff --git a/src/views/main/undergroundCavity/upload.vue b/src/views/main/undergroundCavity/upload.vue
new file mode 100644
index 0000000..aa702da
--- /dev/null
+++ b/src/views/main/undergroundCavity/upload.vue
@@ -0,0 +1,121 @@
+<script lang="ts" setup name="FileView">
+import { ElMessage } from 'element-plus'
+import { getFileUrl, uploadFile } from '@/api/common'
+const props = defineProps({
+// 数据绑定
+  modelValue: {
+    type: String || Array,
+    default: '',
+  },
+  // 是否允许上传多个文件(多个为String[], 单个为string)
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
+  // 类型
+  type: {
+    type: String,
+    default: 'create', // create update detail
+  },
+  // 支持上传的文件
+  accept: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['update:modelValue'])
+const value = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+const isPhoto = (name: string) => {
+  return name.split('.')[1] === 'png' || name.split('.')[1] === 'jpg' || name.split('.')[1] === 'jpeg'
+}
+
+const url = ref('')
+const urlList = ref<any[]>([])
+const getPhoto = () => {
+  if (!props.isMulti) {
+    if (props.modelValue) {
+      getFileUrl(props.modelValue).then((res) => {
+        url.value = res.data
+      })
+    }
+  }
+  else {
+    const data = props.modelValue.split(',').map((item: string) => {
+      return {
+        name: item,
+        url: '',
+      }
+    })
+    data.forEach((item: any) => {
+      getFileUrl(item.name).then((res) => {
+        item.url = res.data
+      })
+    })
+    urlList.value = data
+  }
+}
+onMounted(() => {
+  getPhoto()
+})
+onUpdated(() => {
+  getPhoto()
+})
+// 上传
+const importRef = ref() // 上传组件
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('file', event.target.files[0])
+    uploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data, '上传的文件')
+        value.value = event.target.files[0].name
+        ElMessage.success('上传成功')
+      }
+      // 清空上传缓存
+      importRef.value.value = ''
+    }).catch(() => {
+      // 清空上传缓存
+      importRef.value.value = ''
+    })
+  }
+}
+// 单一文件 上传更换
+const handler = () => {
+  importRef.value.click()
+}
+</script>
+
+<template>
+  <div class="container">
+    <!-- 上传组件 -->
+    <input ref="importRef" style="display: none;" type="file" :accept="props.accept" @change="onFileChange">
+    <div v-if="!props.isMulti">
+      <el-image
+        v-if="props.modelValue && isPhoto(props.modelValue)"
+        :style="{ width: '50px', height: '50px' }"
+        :src="url"
+        :preview-src-list="[url]"
+        fit="cover"
+      />
+      <el-link
+        v-else :href="url" type="primary"
+        style="margin-right: 10px;"
+        target="_blank"
+      >
+        {{ props.modelValue }}
+      </el-link>
+      <el-button v-if="props.type !== 'detail'" type="primary" @click="handler">
+        {{ props.modelValue ? '更换' : '上传' }}
+      </el-button>
+    </div>
+  </div>
+</template>