diff --git a/public/config/config.json b/public/config/config.json
index 22f4711..1053b40 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://111.198.10.15:11643",
+  "baseUrl": "http://10.30.7.26:20705",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",

diff --git a/public/config/config.json b/public/config/config.json
index 22f4711..1053b40 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://111.198.10.15:11643",
+  "baseUrl": "http://10.30.7.26:20705",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/api/home/alarm/current.ts b/src/api/home/alarm/current.ts
index cc36a2f..d1a2ed1 100644
--- a/src/api/home/alarm/current.ts
+++ b/src/api/home/alarm/current.ts
@@ -67,6 +67,16 @@
     },
   })
 }
+// 手动消警
+export function batchHandDelete(codes: any) {
+  return request({
+    url: '/system/alarmRecords/cancelAlarmByLedgerNumber',
+    method: 'post',
+    data: {
+      codes,
+    },
+  })
+}
 export function exportCurrentAlarm(data: any) {
   return request({
     url: '/system/alarmRecords/batchExport',

diff --git a/public/config/config.json b/public/config/config.json
index 22f4711..1053b40 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://111.198.10.15:11643",
+  "baseUrl": "http://10.30.7.26:20705",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/api/home/alarm/current.ts b/src/api/home/alarm/current.ts
index cc36a2f..d1a2ed1 100644
--- a/src/api/home/alarm/current.ts
+++ b/src/api/home/alarm/current.ts
@@ -67,6 +67,16 @@
     },
   })
 }
+// 手动消警
+export function batchHandDelete(codes: any) {
+  return request({
+    url: '/system/alarmRecords/cancelAlarmByLedgerNumber',
+    method: 'post',
+    data: {
+      codes,
+    },
+  })
+}
 export function exportCurrentAlarm(data: any) {
   return request({
     url: '/system/alarmRecords/batchExport',
diff --git a/src/components.d.ts b/src/components.d.ts
index b6e680f..003b04b 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,21 +74,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
-    VanBackTop: typeof import('vant/es')['BackTop']
-    VanCell: typeof import('vant/es')['Cell']
-    VanCellGroup: typeof import('vant/es')['CellGroup']
-    VanDatePicker: typeof import('vant/es')['DatePicker']
-    VanDialog: typeof import('vant/es')['Dialog']
-    VanEmpty: typeof import('vant/es')['Empty']
-    VanField: typeof import('vant/es')['Field']
-    VanForm: typeof import('vant/es')['Form']
-    VanIcon: typeof import('vant/es')['Icon']
-    VanPicker: typeof import('vant/es')['Picker']
-    VanPickerGroup: typeof import('vant/es')['PickerGroup']
-    VanPopup: typeof import('vant/es')['Popup']
-    VanRadio: typeof import('vant/es')['Radio']
-    VanRadioGroup: typeof import('vant/es')['RadioGroup']
-    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }

diff --git a/public/config/config.json b/public/config/config.json
index 22f4711..1053b40 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://111.198.10.15:11643",
+  "baseUrl": "http://10.30.7.26:20705",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/api/home/alarm/current.ts b/src/api/home/alarm/current.ts
index cc36a2f..d1a2ed1 100644
--- a/src/api/home/alarm/current.ts
+++ b/src/api/home/alarm/current.ts
@@ -67,6 +67,16 @@
     },
   })
 }
+// 手动消警
+export function batchHandDelete(codes: any) {
+  return request({
+    url: '/system/alarmRecords/cancelAlarmByLedgerNumber',
+    method: 'post',
+    data: {
+      codes,
+    },
+  })
+}
 export function exportCurrentAlarm(data: any) {
   return request({
     url: '/system/alarmRecords/batchExport',
diff --git a/src/components.d.ts b/src/components.d.ts
index b6e680f..003b04b 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,21 +74,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
-    VanBackTop: typeof import('vant/es')['BackTop']
-    VanCell: typeof import('vant/es')['Cell']
-    VanCellGroup: typeof import('vant/es')['CellGroup']
-    VanDatePicker: typeof import('vant/es')['DatePicker']
-    VanDialog: typeof import('vant/es')['Dialog']
-    VanEmpty: typeof import('vant/es')['Empty']
-    VanField: typeof import('vant/es')['Field']
-    VanForm: typeof import('vant/es')['Form']
-    VanIcon: typeof import('vant/es')['Icon']
-    VanPicker: typeof import('vant/es')['Picker']
-    VanPickerGroup: typeof import('vant/es')['PickerGroup']
-    VanPopup: typeof import('vant/es')['Popup']
-    VanRadio: typeof import('vant/es')['Radio']
-    VanRadioGroup: typeof import('vant/es')['RadioGroup']
-    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index f0cadbc..c649738 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -186,6 +186,20 @@
         }
       }
     })
+    // 处理挂起结束
+    const pending = alarmDynamics.value.find((item: any) => item.process_name === '挂起' && item.confirmValue)
+    if(pending) {
+     const pendingIndex = alarmDynamics.value.findIndex((item: any) => item.process_name === '挂起' && item.confirmValue)
+     // 上一个状态
+     const lastStatus = alarmDynamics.value[pendingIndex - 1]
+     alarmDynamics.value.splice(pendingIndex+ 1, 1, {
+      process_name: `挂起时间到，状态改为${lastStatus?.process_name || ' '}`,
+      approvalTime: pending.confirmValue,
+      approvalPerson: '',
+      dept_name: '',
+      name: ''
+     })
+    }
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false

diff --git a/public/config/config.json b/public/config/config.json
index 22f4711..1053b40 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://111.198.10.15:11643",
+  "baseUrl": "http://10.30.7.26:20705",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/api/home/alarm/current.ts b/src/api/home/alarm/current.ts
index cc36a2f..d1a2ed1 100644
--- a/src/api/home/alarm/current.ts
+++ b/src/api/home/alarm/current.ts
@@ -67,6 +67,16 @@
     },
   })
 }
+// 手动消警
+export function batchHandDelete(codes: any) {
+  return request({
+    url: '/system/alarmRecords/cancelAlarmByLedgerNumber',
+    method: 'post',
+    data: {
+      codes,
+    },
+  })
+}
 export function exportCurrentAlarm(data: any) {
   return request({
     url: '/system/alarmRecords/batchExport',
diff --git a/src/components.d.ts b/src/components.d.ts
index b6e680f..003b04b 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,21 +74,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
-    VanBackTop: typeof import('vant/es')['BackTop']
-    VanCell: typeof import('vant/es')['Cell']
-    VanCellGroup: typeof import('vant/es')['CellGroup']
-    VanDatePicker: typeof import('vant/es')['DatePicker']
-    VanDialog: typeof import('vant/es')['Dialog']
-    VanEmpty: typeof import('vant/es')['Empty']
-    VanField: typeof import('vant/es')['Field']
-    VanForm: typeof import('vant/es')['Form']
-    VanIcon: typeof import('vant/es')['Icon']
-    VanPicker: typeof import('vant/es')['Picker']
-    VanPickerGroup: typeof import('vant/es')['PickerGroup']
-    VanPopup: typeof import('vant/es')['Popup']
-    VanRadio: typeof import('vant/es')['Radio']
-    VanRadioGroup: typeof import('vant/es')['RadioGroup']
-    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index f0cadbc..c649738 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -186,6 +186,20 @@
         }
       }
     })
+    // 处理挂起结束
+    const pending = alarmDynamics.value.find((item: any) => item.process_name === '挂起' && item.confirmValue)
+    if(pending) {
+     const pendingIndex = alarmDynamics.value.findIndex((item: any) => item.process_name === '挂起' && item.confirmValue)
+     // 上一个状态
+     const lastStatus = alarmDynamics.value[pendingIndex - 1]
+     alarmDynamics.value.splice(pendingIndex+ 1, 1, {
+      process_name: `挂起时间到，状态改为${lastStatus?.process_name || ' '}`,
+      approvalTime: pending.confirmValue,
+      approvalPerson: '',
+      dept_name: '',
+      name: ''
+     })
+    }
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 69fae06..fab569f 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -8,7 +8,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-import { batchDelete, detailAlarm, exportCurrentAlarm, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
+import { batchDelete, batchHandDelete, detailAlarm, exportCurrentAlarm, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
 import { getStationListPage } from '@/api/home/station/station'
 import { getDictByCode } from '@/api/system/dict'
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
@@ -547,6 +547,31 @@
     })
   })
 }
+// 手动消警
+const handAlarm = () => {
+  if (!multipleTable.value.length) {
+    ElMessage.warning('请先选中数据')
+    return
+  }
+   ElMessageBox.confirm(
+    '确定要消除选中的数据吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(res => {
+    batchHandDelete(multipleTable.value.map((item: any) => item.ledgerNumber)).then(res => {
+      ElMessage.success('操作成功')
+      // 清空多选
+      multipleTable.value = []
+      tableRef.value.clearMulti()
+      fetchData()
+    })
+  })
+}
+// batchHandDelete
 // 跳转设备详情
 const toDeviceDetail = (row: any) => {
   if (!row.devcode || !row.devTypeName) {
@@ -779,6 +804,9 @@
           <template #btns-right>
             <!-- 操作 -->
             <div>
+              <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="handAlarm">
+                手动消警
+              </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量处置
               </el-button>

diff --git a/public/config/config.json b/public/config/config.json
index 22f4711..1053b40 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://111.198.10.15:11643",
+  "baseUrl": "http://10.30.7.26:20705",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/api/home/alarm/current.ts b/src/api/home/alarm/current.ts
index cc36a2f..d1a2ed1 100644
--- a/src/api/home/alarm/current.ts
+++ b/src/api/home/alarm/current.ts
@@ -67,6 +67,16 @@
     },
   })
 }
+// 手动消警
+export function batchHandDelete(codes: any) {
+  return request({
+    url: '/system/alarmRecords/cancelAlarmByLedgerNumber',
+    method: 'post',
+    data: {
+      codes,
+    },
+  })
+}
 export function exportCurrentAlarm(data: any) {
   return request({
     url: '/system/alarmRecords/batchExport',
diff --git a/src/components.d.ts b/src/components.d.ts
index b6e680f..003b04b 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,21 +74,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
-    VanBackTop: typeof import('vant/es')['BackTop']
-    VanCell: typeof import('vant/es')['Cell']
-    VanCellGroup: typeof import('vant/es')['CellGroup']
-    VanDatePicker: typeof import('vant/es')['DatePicker']
-    VanDialog: typeof import('vant/es')['Dialog']
-    VanEmpty: typeof import('vant/es')['Empty']
-    VanField: typeof import('vant/es')['Field']
-    VanForm: typeof import('vant/es')['Form']
-    VanIcon: typeof import('vant/es')['Icon']
-    VanPicker: typeof import('vant/es')['Picker']
-    VanPickerGroup: typeof import('vant/es')['PickerGroup']
-    VanPopup: typeof import('vant/es')['Popup']
-    VanRadio: typeof import('vant/es')['Radio']
-    VanRadioGroup: typeof import('vant/es')['RadioGroup']
-    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index f0cadbc..c649738 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -186,6 +186,20 @@
         }
       }
     })
+    // 处理挂起结束
+    const pending = alarmDynamics.value.find((item: any) => item.process_name === '挂起' && item.confirmValue)
+    if(pending) {
+     const pendingIndex = alarmDynamics.value.findIndex((item: any) => item.process_name === '挂起' && item.confirmValue)
+     // 上一个状态
+     const lastStatus = alarmDynamics.value[pendingIndex - 1]
+     alarmDynamics.value.splice(pendingIndex+ 1, 1, {
+      process_name: `挂起时间到，状态改为${lastStatus?.process_name || ' '}`,
+      approvalTime: pending.confirmValue,
+      approvalPerson: '',
+      dept_name: '',
+      name: ''
+     })
+    }
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 69fae06..fab569f 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -8,7 +8,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-import { batchDelete, detailAlarm, exportCurrentAlarm, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
+import { batchDelete, batchHandDelete, detailAlarm, exportCurrentAlarm, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
 import { getStationListPage } from '@/api/home/station/station'
 import { getDictByCode } from '@/api/system/dict'
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
@@ -547,6 +547,31 @@
     })
   })
 }
+// 手动消警
+const handAlarm = () => {
+  if (!multipleTable.value.length) {
+    ElMessage.warning('请先选中数据')
+    return
+  }
+   ElMessageBox.confirm(
+    '确定要消除选中的数据吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(res => {
+    batchHandDelete(multipleTable.value.map((item: any) => item.ledgerNumber)).then(res => {
+      ElMessage.success('操作成功')
+      // 清空多选
+      multipleTable.value = []
+      tableRef.value.clearMulti()
+      fetchData()
+    })
+  })
+}
+// batchHandDelete
 // 跳转设备详情
 const toDeviceDetail = (row: any) => {
   if (!row.devcode || !row.devTypeName) {
@@ -779,6 +804,9 @@
           <template #btns-right>
             <!-- 操作 -->
             <div>
+              <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="handAlarm">
+                手动消警
+              </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量处置
               </el-button>
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index f710718..43a1f5b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -7,7 +7,11 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormRules, TabsPaneContext } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
-import { addPosition, editPosition, getPositionListPage } from '@/api/home/device/device'
+import {
+  addPosition,
+  editPosition,
+  getPositionListPage
+} from '@/api/home/device/device'
 import { getPiePleListPage } from '@/api/home/ledger/pipeline'
 import AMap from '@/components/map/index.vue'
 // import { getDictByCode } from '@/api/system/dict'
@@ -30,14 +34,28 @@
   deptid: '', // 管理单位
   pipeCode: '', // 关联管线
   locationCategory: '',
+  propertyPerson: '',
+  propertyPhone: '',
 }) // 表单
 const rules: FormRules = {
-  tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
-  longitude: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
-  latitude: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }],
-  position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
-  deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
-  pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
+  tagNumber: [
+    { required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }
+  ],
+  longitude: [
+    { required: true, message: '经度不能为空', trigger: ['blur', 'change'] }
+  ],
+  latitude: [
+    { required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }
+  ],
+  position: [
+    { required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }
+  ],
+  deptid: [
+    { required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }
+  ],
+  pipeCode: [
+    { required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }
+  ]
 } // 前端校验规则
 
 const mapRef = ref()
@@ -53,11 +71,14 @@
 // 地图加载完成
 const completeMap = () => {
   if (dataForm.value.longitude && dataForm.value.latitude) {
-    mapRef.value.map?.setCenter([dataForm.value.longitude, dataForm.value.latitude])
+    mapRef.value.map?.setCenter([
+      dataForm.value.longitude,
+      dataForm.value.latitude
+    ])
     mapRef.value.addMarker({
       position: [dataForm.value.longitude, dataForm.value.latitude],
       content: '',
-      label: '',
+      label: ''
     })
   }
   // 加载中心点marker
@@ -80,7 +101,7 @@
   mapRef.value.addMarker({
     position: location,
     content: '',
-    label: '',
+    label: ''
   })
   // 填充坐标信息
   dataForm.value.longitude = e.lnglat.getLng()
@@ -101,6 +122,8 @@
   { text: '管线编号', value: 'pipeCode', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
+      { text: '负责人', value: 'propertyPerson', align: 'center', width: '100' },
+  { text: '联系电话', value: 'propertyPhone', align: 'center', width: '120' },
 ])
 const loadingTable = ref(true)
 //  查询条件
@@ -110,18 +133,20 @@
   tagNumber: '', // 位号
   pipeCode: '', // 编号
   deptId: '', // 管理单位
-  position: '', // 详细位置
+  position: '' // 详细位置
 } as { [key: string]: string | number })
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  getPositionListPage(listQuery.value).then((res) => {
-    list.value = res.data.rows
-    total.value = res.data.total
-    loadingTable.value = false
-  }).catch(() => {
-    loadingTable.value = false
-  })
+  getPositionListPage(listQuery.value)
+    .then(res => {
+      list.value = res.data.rows
+      total.value = res.data.total
+      loadingTable.value = false
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
 }
 fetchData()
 // 重置查询条件f
@@ -132,7 +157,7 @@
     tagNumber: '', // 位号
     pipeCode: '', // 编号
     deptId: '', // 管理单位
-    position: '', // 详细位置
+    position: '' // 详细位置
   }
   fetchData()
 }
@@ -157,49 +182,58 @@
   if (row.tagNumber && row.deptid) {
     // console.log('找到绑定关系')
     loading.value = true
-    getPositionListPage({ tagNumber: row.tagNumber, deptid: row.deptid, offset: 1, limit: 1 }).then(res => {
-      if (res.data.rows.length) {
-        if (Boolean(res.data.rows[0].lngGaode && res.data.rows[0].latGaode)) {
-          const location = [res.data.rows[0].lngGaode, res.data.rows[0].latGaode]
-          mapRef.value.removeMarker()
-          mapRef.value.addMarker({
-            position: location,
-            content: '',
-            label: '',
-          })
-          dataForm.value.longitude = res.data.rows[0].lngGaode
-          dataForm.value.latitude = res.data.rows[0].latGaode
-          mapRef.value.map.setCenter(location)
-          // mapRef.value.map.setZoom(9)
-          // setTimeout(() => {
-          //   mapRef.value.map.setZoom(14)
-          // }, 500)
-        }
-        else {
+    getPositionListPage({
+      tagNumber: row.tagNumber,
+      deptid: row.deptid,
+      offset: 1,
+      limit: 1
+    })
+      .then(res => {
+        if (res.data.rows.length) {
+          if (Boolean(res.data.rows[0].lngGaode && res.data.rows[0].latGaode)) {
+            const location = [
+              res.data.rows[0].lngGaode,
+              res.data.rows[0].latGaode
+            ]
+            mapRef.value.removeMarker()
+            mapRef.value.addMarker({
+              position: location,
+              content: '',
+              label: ''
+            })
+            dataForm.value.longitude = res.data.rows[0].lngGaode
+            dataForm.value.latitude = res.data.rows[0].latGaode
+            mapRef.value.map.setCenter(location)
+            // mapRef.value.map.setZoom(9)
+            // setTimeout(() => {
+            //   mapRef.value.map.setZoom(14)
+            // }, 500)
+          } else {
+            mapRef.value.removeMarker()
+            dataForm.value.longitude = ''
+            dataForm.value.latitude = ''
+            // mapRef.value.map.setCenter([])
+            ElMessage.warning('该点位缺少坐标位置，请选择坐标位置')
+          }
+          dataForm.value.position = res.data.rows[0].position
+          dataForm.value.deptid = row.deptid
+          dataForm.value.tagNumber = row.tagNumber
+          dataForm.value.pipeCode = res.data.rows[0].pipeCode
+          dataForm.value.propertyPerson = res.data.rows[0].propertyPerson
+          dataForm.value.propertyPhone = res.data.rows[0].propertyPhone
+        } else {
           mapRef.value.removeMarker()
           dataForm.value.longitude = ''
           dataForm.value.latitude = ''
-          // mapRef.value.map.setCenter([])
+          dataForm.value.position = ''
           ElMessage.warning('该点位缺少坐标位置，请选择坐标位置')
         }
-        dataForm.value.position = res.data.rows[0].position
-        dataForm.value.deptid = row.deptid
-        dataForm.value.tagNumber = row.tagNumber
-        dataForm.value.pipeCode = res.data.rows[0].pipeCode
-      }
-      else {
-        mapRef.value.removeMarker()
-        dataForm.value.longitude = ''
-        dataForm.value.latitude = ''
-        dataForm.value.position = ''
-        ElMessage.warning('该点位缺少坐标位置，请选择坐标位置')
-      }
-      loading.value = false
-    }).catch(() => {
-      loading.value = false
-    })
-  }
-  else {
+        loading.value = false
+      })
+      .catch(() => {
+        loading.value = false
+      })
+  } else {
     loading.value = false
     // console.log('没有找到绑定关系')
     dataForm.value.longitude = ''
@@ -208,6 +242,8 @@
     dataForm.value.deptid = ''
     dataForm.value.tagNumber = ''
     dataForm.value.pipeCode = ''
+    dataForm.value.propertyPerson = ''
+    dataForm.value.propertyPhone = ''
     // 判断是否同意获取当前位置
     const setInfo = (longitude: string | number, latitude: string | number) => {
       mapRef.value.map.setCenter([longitude, latitude])
@@ -224,44 +260,49 @@
       mapRef.value.addMarker({
         position: [longitude, latitude],
         content: '',
-        label: '',
+        label: ''
       })
     }
     setTimeout(() => {
-      mapRef.value.getLocation((position: any) => {
-        // console.log(position, 'positon')
-        // console.log(position.position.lng, 'positon.positon.lng')
-        setTimeout(() => {
-          setInfo(position.position.lng, position.position.lat)
-        })
-      }, () => {
-        if (!sessionStorage.getItem('longitude')) {
-          getLocation()
+      mapRef.value.getLocation(
+        (position: any) => {
+          // console.log(position, 'positon')
+          // console.log(position.position.lng, 'positon.positon.lng')
           setTimeout(() => {
-            if (sessionStorage.getItem('longitude')) {
-              setInfo(sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string)
-            }
-            else {
-              mapRef.value.map.setCenter(['116.397428', '39.90923'])
-              // mapRef.value.map.setZoom(9)
-              // setTimeout(() => {
-              //   mapRef.value.map.setZoom(14)
-              // }, 500)
-            }
+            setInfo(position.position.lng, position.position.lat)
           })
+        },
+        () => {
+          if (!sessionStorage.getItem('longitude')) {
+            getLocation()
+            setTimeout(() => {
+              if (sessionStorage.getItem('longitude')) {
+                setInfo(
+                  sessionStorage.getItem('longitude') as string,
+                  sessionStorage.getItem('latitude') as string
+                )
+              } else {
+                mapRef.value.map.setCenter(['116.397428', '39.90923'])
+                // mapRef.value.map.setZoom(9)
+                // setTimeout(() => {
+                //   mapRef.value.map.setZoom(14)
+                // }, 500)
+              }
+            })
+          } else {
+            setInfo(
+              sessionStorage.getItem('longitude') as string,
+              sessionStorage.getItem('latitude') as string
+            )
+          }
         }
-        else {
-          setInfo(sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string)
-        }
-      })
+      )
     })
-
   }
-
 }
 const dialogRef = ref()
 defineExpose({
-  initDialog,
+  initDialog
 })
 // 保存数据
 const deptRef = ref()
@@ -273,100 +314,117 @@
         // 先查询是否含有该位号
         getPositionListPage({
           tagNumber: dataForm.value.tagNumber,
-          deptid: dataForm.value.deptid,
-          offset: 1, limit: 1
-        }).then(res => {
-          disabledBtn.value = false
-          if (res.data.rows.length) {
-            //  已经含有
-            ElMessageBox.confirm(
-              '该点位已经存在，确认编辑该点位信息?',
-              '提示',
-              {
-                confirmButtonText: '确认',
-                cancelButtonText: '取消',
-                type: 'warning',
-              }
-            ).then(() => {
+          // deptid: dataForm.value.deptid,
+          offset: 1,
+          limit: 1
+        })
+          .then(res => {
+            disabledBtn.value = false
+            if (res.data.rows.length) {
+              //  已经含有
+              ElMessageBox.confirm(
+                '该点位已经存在，确认编辑该点位信息?',
+                '提示',
+                {
+                  confirmButtonText: '确认',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+                }
+              ).then(() => {
+                loading.value = true
+                const data = res.data.rows[0]
+                const result = {
+                  deptName: data.deptName,
+                  latGaode: data.latGaode,
+                  lngGaode: data.lngGaode,
+                  // pipeCode: data.pipeCode,
+                  // deptid: data.deptid,
+                  // position: data.position,
+                  // tagNumber: data.tagNumber,
+                  // longitude: data.lngGaode, // 经度
+                  // latitude: data.latGaode, // 纬度
+                  id: data.id,
+                  ...dataForm.value
+                }
+                disabledBtn.value = true
+                editPosition({
+                  deptid: dataForm.value.deptid,
+                  latGaode: dataForm.value.latitude,
+                  lngGaode: dataForm.value.longitude,
+                  pipeCode: dataForm.value.pipeCode,
+                  position: dataForm.value.position,
+                  tagNumber: dataForm.value.tagNumber,
+                  id: data.id,
+                  type: '3',
+                  locationCategory: dataForm.value.locationCategory,
+                  propertyPerson: dataForm.value.propertyPerson,
+                  propertyPhone: dataForm.value.propertyPhone,
+                })
+                  .then(res => {
+                    ElMessage.success('编辑点位成功')
+                    emits('confirm', result, 'single')
+                    dialogFormVisible.value = false
+                    loading.value = false
+                    disabledBtn.value = false
+                  })
+                  .catch(() => {
+                    loading.value = false
+                    disabledBtn.value = false
+                  })
+              })
+            } else {
               loading.value = true
-              const data = res.data.rows[0]
-              const result = {
-                deptName: data.deptName,
-                latGaode: data.latGaode,
-                lngGaode: data.lngGaode,
-                // pipeCode: data.pipeCode,
-                // deptid: data.deptid,
-                // position: data.position,
-                // tagNumber: data.tagNumber,
-                // longitude: data.lngGaode, // 经度
-                // latitude: data.latGaode, // 纬度
-                id: data.id,
-                ...dataForm.value,
-              }
               disabledBtn.value = true
-              editPosition({
+              addPosition({
                 deptid: dataForm.value.deptid,
                 latGaode: dataForm.value.latitude,
                 lngGaode: dataForm.value.longitude,
                 pipeCode: dataForm.value.pipeCode,
                 position: dataForm.value.position,
                 tagNumber: dataForm.value.tagNumber,
-                id: data.id,
                 type: '3',
-                locationCategory: dataForm.value.locationCategory
-              }).then(res => {
-                ElMessage.success('编辑点位成功')
-                emits('confirm', result, 'single')
-                dialogFormVisible.value = false
-                loading.value = false
-                disabledBtn.value = false
-              }).catch(() => {
-                loading.value = false
-                disabledBtn.value = false
+                locationCategory: dataForm.value.locationCategory,
+                propertyPerson: dataForm.value.propertyPerson,
+                  propertyPhone: dataForm.value.propertyPhone,
               })
-            })
-          }
-          else {
-            loading.value = true
-            disabledBtn.value = true
-            addPosition({
-              deptid: dataForm.value.deptid,
-              latGaode: dataForm.value.latitude,
-              lngGaode: dataForm.value.longitude,
-              pipeCode: dataForm.value.pipeCode,
-              position: dataForm.value.position,
-              tagNumber: dataForm.value.tagNumber,
-              type: '3',
-              locationCategory: dataForm.value.locationCategory
-            }).then((res) => {
-              if (res.code === 200) {
-                ElMessage.success('新建点位成功')
-                emits('confirm', {
-                  ...dataForm.value,
-                  deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
-                  latGaode: dataForm.value.latitude,
-                  lngGaode: dataForm.value.longitude,
-                  id: res.data,
-                }, 'single')
-                dialogFormVisible.value = false
-                // dialogRef.value.close()
-                loading.value = false
-                disabledBtn.value = false
-              }
-            }).catch(() => {
-              loading.value = false
-              disabledBtn.value = false
-            })
-          }
-        })
+                .then(res => {
+                  if (res.code === 200) {
+                    ElMessage.success('新建点位成功')
+                    emits(
+                      'confirm',
+                      {
+                        ...dataForm.value,
+                        deptName: deptRef.value.fetchDeptTree().length
+                          ? deptRef.value
+                              .fetchDeptTree()
+                              .filter(
+                                (item: any) => item.id === dataForm.value.deptid
+                              ).name
+                          : '',
+                        latGaode: dataForm.value.latitude,
+                        lngGaode: dataForm.value.longitude,
+                        id: res.data
+                      },
+                      'single'
+                    )
+                    dialogFormVisible.value = false
+                    // dialogRef.value.close()
+                    loading.value = false
+                    disabledBtn.value = false
+                  }
+                })
+                .catch(() => {
+                  loading.value = false
+                  disabledBtn.value = false
+                })
+            }
+          })
           .catch(() => {
             disabledBtn.value = false
           })
-
       }
     })
-  }
-  else {
+  } else {
     if (select.value === -1) {
       ElMessage.warning('请选择数据')
       return
@@ -385,14 +443,14 @@
 const locationTypeList = ref<{ id: string; name: string; value: string }[]>([])
 // 获取字典
 const fetchDict = () => {
-  getPiePleListPage({ offset: 1, limit: 99999 }).then((res) => {
+  getPiePleListPage({ offset: 1, limit: 99999 }).then(res => {
     pipeList.value = res.data.rows.map((item: any) => ({
       name: item.pipeCode,
       id: item.pipeCode,
-      value: item.pipeCode,
+      value: item.pipeCode
     }))
   })
-  getDictByCode('locationType').then((res) => {
+  getDictByCode('locationType').then(res => {
     locationTypeList.value = res.data
   })
 }
@@ -401,64 +459,152 @@
 // 编辑临时点位
 const editRef = ref()
 const editRow = (row: any) => {
-    // console.log(row, '111')
-    editRef.value.initDialog('edit', row)
+  // console.log(row, '111')
+  editRef.value.initDialog('edit', row)
 }
 </script>
 
 <template>
-  <el-dialog ref="dialogRef" v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
+  <el-dialog
+    ref="dialogRef"
+    v-model="dialogFormVisible"
+    title="选择安装位置"
+    append-to-body
+    width="70%"
+  >
     <addDialog ref="editRef" @refresh="fetchData" />
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane v-loading="loading" label="新建/编辑点位" name="新建点位">
-        <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
+        <el-form
+          ref="dataFormRef"
+          :rules="rules"
+          :model="dataForm"
+          label-position="right"
+          label-width="80px"
+        >
           <el-row :gutter="24">
             <el-col :span="6">
               <el-form-item label="安装位号" prop="tagNumber">
-                <el-input v-model.trim="dataForm.tagNumber" type="text" placeholder="安装位号" style="width: 100%;"
-                  clearable />
+                <el-input
+                  v-model.trim="dataForm.tagNumber"
+                  type="text"
+                  placeholder="安装位号"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="位置类别">
-                <el-select v-model="dataForm.locationCategory" placeholder="位置类别" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in locationTypeList" :key="item.id" :label="item.name" :value="item.value" />
+                <el-select
+                  v-model="dataForm.locationCategory"
+                  placeholder="位置类别"
+                  style="width: 100%"
+                  clearable
+                  filterable
+                >
+                  <el-option
+                    v-for="item in locationTypeList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.value"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="关联管线">
-                <el-select v-model="dataForm.pipeCode" placeholder="关联管线" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in pipeList" :key="item.id" :label="item.name" :value="item.value" />
+                <el-select
+                  v-model="dataForm.pipeCode"
+                  placeholder="关联管线"
+                  style="width: 100%"
+                  clearable
+                  filterable
+                >
+                  <el-option
+                    v-for="item in pipeList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.value"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="管理单位" prop="deptid">
-                <dept-select ref="deptRef" v-model="dataForm.deptid" placeholder="管理单位" :clearable="true"
-                  style="width: 100%;" />
+                <dept-select
+                  ref="deptRef"
+                  v-model="dataForm.deptid"
+                  placeholder="管理单位"
+                  :clearable="true"
+                  style="width: 100%"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="8">
               <el-form-item label="详细位置" prop="position">
-                <el-input v-model.trim="dataForm.position" type="textarea" :rows="6" placeholder="详细位置"
-                  style="width: 100%;" clearable />
+                <el-input
+                  v-model.trim="dataForm.position"
+                  type="textarea"
+                  :rows="6"
+                  placeholder="详细位置"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
               <el-form-item label="经度" prop="longitude">
-                <el-input v-model.trim="dataForm.longitude" type="text" placeholder="经度" style="width: 100%;"
-                  clearable />
+                <el-input
+                  v-model.trim="dataForm.longitude"
+                  type="text"
+                  placeholder="经度"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
               <el-form-item label="纬度" prop="latitude">
-                <el-input v-model.trim="dataForm.latitude" type="text" placeholder="纬度" style="width: 100%;"
-                  clearable />
+                <el-input
+                  v-model.trim="dataForm.latitude"
+                  type="text"
+                  placeholder="纬度"
+                  style="width: 100%"
+                  clearable
+                />
+              </el-form-item>
+              <el-form-item label="负责人" prop="propertyPerson">
+                <el-input
+                  v-model.trim="dataForm.propertyPerson"
+                  type="text"
+                  placeholder="负责人"
+                  style="width: 100%"
+                  clearable
+                />
+              </el-form-item>
+              <el-form-item label="联系电话" prop="propertyPhone">
+                <el-input
+                  v-model.trim="dataForm.propertyPhone"
+                  type="text"
+                  placeholder="联系电话"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
             </el-col>
-            <el-col :span="16" v-if="dialogFormVisible && activeName === '新建点位'">
+            <el-col
+              :span="16"
+              v-if="dialogFormVisible && activeName === '新建点位'"
+            >
               <!-- 地图 -->
-              <a-map ref="mapRef" :show-pieple-layer="true" :center="mapCenter" :zoom="14" @complete="completeMap"
-                @map-click="mapClick" style="width: 100%; height: 240px;" />
+              <a-map
+                ref="mapRef"
+                :show-pieple-layer="true"
+                :center="mapCenter"
+                :zoom="14"
+                @complete="completeMap"
+                @map-click="mapClick"
+                style="width: 100%; height: 340px"
+              />
             </el-col>
           </el-row>
         </el-form>
@@ -466,39 +612,78 @@
       <el-tab-pane label="既有位置" name="既有位置">
         <search-area :need-clear="true" @search="fetchData" @clear="reset">
           <search-item>
-            <el-input v-model.trim="listQuery.tagNumber" placeholder="安装位号" clearable style="width: 162px;" />
+            <el-input
+              v-model.trim="listQuery.tagNumber"
+              placeholder="安装位号"
+              clearable
+              style="width: 162px"
+            />
           </search-item>
           <search-item>
-            <el-input v-model.trim="listQuery.pipeCode" placeholder="管线编号" clearable style="width: 162px;" />
+            <el-input
+              v-model.trim="listQuery.pipeCode"
+              placeholder="管线编号"
+              clearable
+              style="width: 162px"
+            />
           </search-item>
           <search-item>
-            <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 162px;" />
+            <dept-select
+              v-model="listQuery.deptId"
+              placeholder="管理单位"
+              :clearable="true"
+              style="width: 162px"
+            />
           </search-item>
           <search-item>
-            <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 162px;" />
+            <el-input
+              v-model.trim="listQuery.position"
+              placeholder="详细位置"
+              clearable
+              style="width: 162px"
+            />
           </search-item>
         </search-area>
         <table-container>
           <!-- 查询结果Table显示 -->
-          <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-            @change="changePage">
+          <normal-table
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loadingTable"
+            @change="changePage"
+          >
             <template #preColumns>
               <el-table-column label="选择" width="55" align="center">
                 <template #default="scope">
-                  <el-radio v-model="select" :label="scope.$index" class="radio" />
+                  <el-radio
+                    v-model="select"
+                    :label="scope.$index"
+                    class="radio"
+                  />
                 </template>
               </el-table-column>
               <el-table-column label="序号" width="75" align="center">
                 <template #default="scope">
-                  {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+                  {{
+                    ((listQuery.offset as number) - 1) *
+                      (listQuery.limit as number) +
+                    scope.$index +
+                    1
+                  }}
                 </template>
               </el-table-column>
             </template>
             <template #columns>
-
               <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
-                  <el-button type="primary" link size="small" @click="editRow(scope.row)">
+                  <el-button
+                    type="primary"
+                    link
+                    size="small"
+                    @click="editRow(scope.row)"
+                  >
                     编辑
                   </el-button>
                 </template>
@@ -510,12 +695,15 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button :loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button
+          :loading="disabledBtn"
+          :disabled="disabledBtn"
+          type="primary"
+          @click="saveData"
+        >
           确认
         </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <el-button @click="cancel"> 取消 </el-button>
       </div>
     </template>
   </el-dialog>

diff --git a/public/config/config.json b/public/config/config.json
index 22f4711..1053b40 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://111.198.10.15:11643",
+  "baseUrl": "http://10.30.7.26:20705",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/api/home/alarm/current.ts b/src/api/home/alarm/current.ts
index cc36a2f..d1a2ed1 100644
--- a/src/api/home/alarm/current.ts
+++ b/src/api/home/alarm/current.ts
@@ -67,6 +67,16 @@
     },
   })
 }
+// 手动消警
+export function batchHandDelete(codes: any) {
+  return request({
+    url: '/system/alarmRecords/cancelAlarmByLedgerNumber',
+    method: 'post',
+    data: {
+      codes,
+    },
+  })
+}
 export function exportCurrentAlarm(data: any) {
   return request({
     url: '/system/alarmRecords/batchExport',
diff --git a/src/components.d.ts b/src/components.d.ts
index b6e680f..003b04b 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,21 +74,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
-    VanBackTop: typeof import('vant/es')['BackTop']
-    VanCell: typeof import('vant/es')['Cell']
-    VanCellGroup: typeof import('vant/es')['CellGroup']
-    VanDatePicker: typeof import('vant/es')['DatePicker']
-    VanDialog: typeof import('vant/es')['Dialog']
-    VanEmpty: typeof import('vant/es')['Empty']
-    VanField: typeof import('vant/es')['Field']
-    VanForm: typeof import('vant/es')['Form']
-    VanIcon: typeof import('vant/es')['Icon']
-    VanPicker: typeof import('vant/es')['Picker']
-    VanPickerGroup: typeof import('vant/es')['PickerGroup']
-    VanPopup: typeof import('vant/es')['Popup']
-    VanRadio: typeof import('vant/es')['Radio']
-    VanRadioGroup: typeof import('vant/es')['RadioGroup']
-    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index f0cadbc..c649738 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -186,6 +186,20 @@
         }
       }
     })
+    // 处理挂起结束
+    const pending = alarmDynamics.value.find((item: any) => item.process_name === '挂起' && item.confirmValue)
+    if(pending) {
+     const pendingIndex = alarmDynamics.value.findIndex((item: any) => item.process_name === '挂起' && item.confirmValue)
+     // 上一个状态
+     const lastStatus = alarmDynamics.value[pendingIndex - 1]
+     alarmDynamics.value.splice(pendingIndex+ 1, 1, {
+      process_name: `挂起时间到，状态改为${lastStatus?.process_name || ' '}`,
+      approvalTime: pending.confirmValue,
+      approvalPerson: '',
+      dept_name: '',
+      name: ''
+     })
+    }
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 69fae06..fab569f 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -8,7 +8,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-import { batchDelete, detailAlarm, exportCurrentAlarm, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
+import { batchDelete, batchHandDelete, detailAlarm, exportCurrentAlarm, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
 import { getStationListPage } from '@/api/home/station/station'
 import { getDictByCode } from '@/api/system/dict'
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
@@ -547,6 +547,31 @@
     })
   })
 }
+// 手动消警
+const handAlarm = () => {
+  if (!multipleTable.value.length) {
+    ElMessage.warning('请先选中数据')
+    return
+  }
+   ElMessageBox.confirm(
+    '确定要消除选中的数据吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(res => {
+    batchHandDelete(multipleTable.value.map((item: any) => item.ledgerNumber)).then(res => {
+      ElMessage.success('操作成功')
+      // 清空多选
+      multipleTable.value = []
+      tableRef.value.clearMulti()
+      fetchData()
+    })
+  })
+}
+// batchHandDelete
 // 跳转设备详情
 const toDeviceDetail = (row: any) => {
   if (!row.devcode || !row.devTypeName) {
@@ -779,6 +804,9 @@
           <template #btns-right>
             <!-- 操作 -->
             <div>
+              <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="handAlarm">
+                手动消警
+              </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量处置
               </el-button>
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index f710718..43a1f5b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -7,7 +7,11 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormRules, TabsPaneContext } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
-import { addPosition, editPosition, getPositionListPage } from '@/api/home/device/device'
+import {
+  addPosition,
+  editPosition,
+  getPositionListPage
+} from '@/api/home/device/device'
 import { getPiePleListPage } from '@/api/home/ledger/pipeline'
 import AMap from '@/components/map/index.vue'
 // import { getDictByCode } from '@/api/system/dict'
@@ -30,14 +34,28 @@
   deptid: '', // 管理单位
   pipeCode: '', // 关联管线
   locationCategory: '',
+  propertyPerson: '',
+  propertyPhone: '',
 }) // 表单
 const rules: FormRules = {
-  tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
-  longitude: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
-  latitude: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }],
-  position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
-  deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
-  pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
+  tagNumber: [
+    { required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }
+  ],
+  longitude: [
+    { required: true, message: '经度不能为空', trigger: ['blur', 'change'] }
+  ],
+  latitude: [
+    { required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }
+  ],
+  position: [
+    { required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }
+  ],
+  deptid: [
+    { required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }
+  ],
+  pipeCode: [
+    { required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }
+  ]
 } // 前端校验规则
 
 const mapRef = ref()
@@ -53,11 +71,14 @@
 // 地图加载完成
 const completeMap = () => {
   if (dataForm.value.longitude && dataForm.value.latitude) {
-    mapRef.value.map?.setCenter([dataForm.value.longitude, dataForm.value.latitude])
+    mapRef.value.map?.setCenter([
+      dataForm.value.longitude,
+      dataForm.value.latitude
+    ])
     mapRef.value.addMarker({
       position: [dataForm.value.longitude, dataForm.value.latitude],
       content: '',
-      label: '',
+      label: ''
     })
   }
   // 加载中心点marker
@@ -80,7 +101,7 @@
   mapRef.value.addMarker({
     position: location,
     content: '',
-    label: '',
+    label: ''
   })
   // 填充坐标信息
   dataForm.value.longitude = e.lnglat.getLng()
@@ -101,6 +122,8 @@
   { text: '管线编号', value: 'pipeCode', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
+      { text: '负责人', value: 'propertyPerson', align: 'center', width: '100' },
+  { text: '联系电话', value: 'propertyPhone', align: 'center', width: '120' },
 ])
 const loadingTable = ref(true)
 //  查询条件
@@ -110,18 +133,20 @@
   tagNumber: '', // 位号
   pipeCode: '', // 编号
   deptId: '', // 管理单位
-  position: '', // 详细位置
+  position: '' // 详细位置
 } as { [key: string]: string | number })
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  getPositionListPage(listQuery.value).then((res) => {
-    list.value = res.data.rows
-    total.value = res.data.total
-    loadingTable.value = false
-  }).catch(() => {
-    loadingTable.value = false
-  })
+  getPositionListPage(listQuery.value)
+    .then(res => {
+      list.value = res.data.rows
+      total.value = res.data.total
+      loadingTable.value = false
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
 }
 fetchData()
 // 重置查询条件f
@@ -132,7 +157,7 @@
     tagNumber: '', // 位号
     pipeCode: '', // 编号
     deptId: '', // 管理单位
-    position: '', // 详细位置
+    position: '' // 详细位置
   }
   fetchData()
 }
@@ -157,49 +182,58 @@
   if (row.tagNumber && row.deptid) {
     // console.log('找到绑定关系')
     loading.value = true
-    getPositionListPage({ tagNumber: row.tagNumber, deptid: row.deptid, offset: 1, limit: 1 }).then(res => {
-      if (res.data.rows.length) {
-        if (Boolean(res.data.rows[0].lngGaode && res.data.rows[0].latGaode)) {
-          const location = [res.data.rows[0].lngGaode, res.data.rows[0].latGaode]
-          mapRef.value.removeMarker()
-          mapRef.value.addMarker({
-            position: location,
-            content: '',
-            label: '',
-          })
-          dataForm.value.longitude = res.data.rows[0].lngGaode
-          dataForm.value.latitude = res.data.rows[0].latGaode
-          mapRef.value.map.setCenter(location)
-          // mapRef.value.map.setZoom(9)
-          // setTimeout(() => {
-          //   mapRef.value.map.setZoom(14)
-          // }, 500)
-        }
-        else {
+    getPositionListPage({
+      tagNumber: row.tagNumber,
+      deptid: row.deptid,
+      offset: 1,
+      limit: 1
+    })
+      .then(res => {
+        if (res.data.rows.length) {
+          if (Boolean(res.data.rows[0].lngGaode && res.data.rows[0].latGaode)) {
+            const location = [
+              res.data.rows[0].lngGaode,
+              res.data.rows[0].latGaode
+            ]
+            mapRef.value.removeMarker()
+            mapRef.value.addMarker({
+              position: location,
+              content: '',
+              label: ''
+            })
+            dataForm.value.longitude = res.data.rows[0].lngGaode
+            dataForm.value.latitude = res.data.rows[0].latGaode
+            mapRef.value.map.setCenter(location)
+            // mapRef.value.map.setZoom(9)
+            // setTimeout(() => {
+            //   mapRef.value.map.setZoom(14)
+            // }, 500)
+          } else {
+            mapRef.value.removeMarker()
+            dataForm.value.longitude = ''
+            dataForm.value.latitude = ''
+            // mapRef.value.map.setCenter([])
+            ElMessage.warning('该点位缺少坐标位置，请选择坐标位置')
+          }
+          dataForm.value.position = res.data.rows[0].position
+          dataForm.value.deptid = row.deptid
+          dataForm.value.tagNumber = row.tagNumber
+          dataForm.value.pipeCode = res.data.rows[0].pipeCode
+          dataForm.value.propertyPerson = res.data.rows[0].propertyPerson
+          dataForm.value.propertyPhone = res.data.rows[0].propertyPhone
+        } else {
           mapRef.value.removeMarker()
           dataForm.value.longitude = ''
           dataForm.value.latitude = ''
-          // mapRef.value.map.setCenter([])
+          dataForm.value.position = ''
           ElMessage.warning('该点位缺少坐标位置，请选择坐标位置')
         }
-        dataForm.value.position = res.data.rows[0].position
-        dataForm.value.deptid = row.deptid
-        dataForm.value.tagNumber = row.tagNumber
-        dataForm.value.pipeCode = res.data.rows[0].pipeCode
-      }
-      else {
-        mapRef.value.removeMarker()
-        dataForm.value.longitude = ''
-        dataForm.value.latitude = ''
-        dataForm.value.position = ''
-        ElMessage.warning('该点位缺少坐标位置，请选择坐标位置')
-      }
-      loading.value = false
-    }).catch(() => {
-      loading.value = false
-    })
-  }
-  else {
+        loading.value = false
+      })
+      .catch(() => {
+        loading.value = false
+      })
+  } else {
     loading.value = false
     // console.log('没有找到绑定关系')
     dataForm.value.longitude = ''
@@ -208,6 +242,8 @@
     dataForm.value.deptid = ''
     dataForm.value.tagNumber = ''
     dataForm.value.pipeCode = ''
+    dataForm.value.propertyPerson = ''
+    dataForm.value.propertyPhone = ''
     // 判断是否同意获取当前位置
     const setInfo = (longitude: string | number, latitude: string | number) => {
       mapRef.value.map.setCenter([longitude, latitude])
@@ -224,44 +260,49 @@
       mapRef.value.addMarker({
         position: [longitude, latitude],
         content: '',
-        label: '',
+        label: ''
       })
     }
     setTimeout(() => {
-      mapRef.value.getLocation((position: any) => {
-        // console.log(position, 'positon')
-        // console.log(position.position.lng, 'positon.positon.lng')
-        setTimeout(() => {
-          setInfo(position.position.lng, position.position.lat)
-        })
-      }, () => {
-        if (!sessionStorage.getItem('longitude')) {
-          getLocation()
+      mapRef.value.getLocation(
+        (position: any) => {
+          // console.log(position, 'positon')
+          // console.log(position.position.lng, 'positon.positon.lng')
           setTimeout(() => {
-            if (sessionStorage.getItem('longitude')) {
-              setInfo(sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string)
-            }
-            else {
-              mapRef.value.map.setCenter(['116.397428', '39.90923'])
-              // mapRef.value.map.setZoom(9)
-              // setTimeout(() => {
-              //   mapRef.value.map.setZoom(14)
-              // }, 500)
-            }
+            setInfo(position.position.lng, position.position.lat)
           })
+        },
+        () => {
+          if (!sessionStorage.getItem('longitude')) {
+            getLocation()
+            setTimeout(() => {
+              if (sessionStorage.getItem('longitude')) {
+                setInfo(
+                  sessionStorage.getItem('longitude') as string,
+                  sessionStorage.getItem('latitude') as string
+                )
+              } else {
+                mapRef.value.map.setCenter(['116.397428', '39.90923'])
+                // mapRef.value.map.setZoom(9)
+                // setTimeout(() => {
+                //   mapRef.value.map.setZoom(14)
+                // }, 500)
+              }
+            })
+          } else {
+            setInfo(
+              sessionStorage.getItem('longitude') as string,
+              sessionStorage.getItem('latitude') as string
+            )
+          }
         }
-        else {
-          setInfo(sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string)
-        }
-      })
+      )
     })
-
   }
-
 }
 const dialogRef = ref()
 defineExpose({
-  initDialog,
+  initDialog
 })
 // 保存数据
 const deptRef = ref()
@@ -273,100 +314,117 @@
         // 先查询是否含有该位号
         getPositionListPage({
           tagNumber: dataForm.value.tagNumber,
-          deptid: dataForm.value.deptid,
-          offset: 1, limit: 1
-        }).then(res => {
-          disabledBtn.value = false
-          if (res.data.rows.length) {
-            //  已经含有
-            ElMessageBox.confirm(
-              '该点位已经存在，确认编辑该点位信息?',
-              '提示',
-              {
-                confirmButtonText: '确认',
-                cancelButtonText: '取消',
-                type: 'warning',
-              }
-            ).then(() => {
+          // deptid: dataForm.value.deptid,
+          offset: 1,
+          limit: 1
+        })
+          .then(res => {
+            disabledBtn.value = false
+            if (res.data.rows.length) {
+              //  已经含有
+              ElMessageBox.confirm(
+                '该点位已经存在，确认编辑该点位信息?',
+                '提示',
+                {
+                  confirmButtonText: '确认',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+                }
+              ).then(() => {
+                loading.value = true
+                const data = res.data.rows[0]
+                const result = {
+                  deptName: data.deptName,
+                  latGaode: data.latGaode,
+                  lngGaode: data.lngGaode,
+                  // pipeCode: data.pipeCode,
+                  // deptid: data.deptid,
+                  // position: data.position,
+                  // tagNumber: data.tagNumber,
+                  // longitude: data.lngGaode, // 经度
+                  // latitude: data.latGaode, // 纬度
+                  id: data.id,
+                  ...dataForm.value
+                }
+                disabledBtn.value = true
+                editPosition({
+                  deptid: dataForm.value.deptid,
+                  latGaode: dataForm.value.latitude,
+                  lngGaode: dataForm.value.longitude,
+                  pipeCode: dataForm.value.pipeCode,
+                  position: dataForm.value.position,
+                  tagNumber: dataForm.value.tagNumber,
+                  id: data.id,
+                  type: '3',
+                  locationCategory: dataForm.value.locationCategory,
+                  propertyPerson: dataForm.value.propertyPerson,
+                  propertyPhone: dataForm.value.propertyPhone,
+                })
+                  .then(res => {
+                    ElMessage.success('编辑点位成功')
+                    emits('confirm', result, 'single')
+                    dialogFormVisible.value = false
+                    loading.value = false
+                    disabledBtn.value = false
+                  })
+                  .catch(() => {
+                    loading.value = false
+                    disabledBtn.value = false
+                  })
+              })
+            } else {
               loading.value = true
-              const data = res.data.rows[0]
-              const result = {
-                deptName: data.deptName,
-                latGaode: data.latGaode,
-                lngGaode: data.lngGaode,
-                // pipeCode: data.pipeCode,
-                // deptid: data.deptid,
-                // position: data.position,
-                // tagNumber: data.tagNumber,
-                // longitude: data.lngGaode, // 经度
-                // latitude: data.latGaode, // 纬度
-                id: data.id,
-                ...dataForm.value,
-              }
               disabledBtn.value = true
-              editPosition({
+              addPosition({
                 deptid: dataForm.value.deptid,
                 latGaode: dataForm.value.latitude,
                 lngGaode: dataForm.value.longitude,
                 pipeCode: dataForm.value.pipeCode,
                 position: dataForm.value.position,
                 tagNumber: dataForm.value.tagNumber,
-                id: data.id,
                 type: '3',
-                locationCategory: dataForm.value.locationCategory
-              }).then(res => {
-                ElMessage.success('编辑点位成功')
-                emits('confirm', result, 'single')
-                dialogFormVisible.value = false
-                loading.value = false
-                disabledBtn.value = false
-              }).catch(() => {
-                loading.value = false
-                disabledBtn.value = false
+                locationCategory: dataForm.value.locationCategory,
+                propertyPerson: dataForm.value.propertyPerson,
+                  propertyPhone: dataForm.value.propertyPhone,
               })
-            })
-          }
-          else {
-            loading.value = true
-            disabledBtn.value = true
-            addPosition({
-              deptid: dataForm.value.deptid,
-              latGaode: dataForm.value.latitude,
-              lngGaode: dataForm.value.longitude,
-              pipeCode: dataForm.value.pipeCode,
-              position: dataForm.value.position,
-              tagNumber: dataForm.value.tagNumber,
-              type: '3',
-              locationCategory: dataForm.value.locationCategory
-            }).then((res) => {
-              if (res.code === 200) {
-                ElMessage.success('新建点位成功')
-                emits('confirm', {
-                  ...dataForm.value,
-                  deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
-                  latGaode: dataForm.value.latitude,
-                  lngGaode: dataForm.value.longitude,
-                  id: res.data,
-                }, 'single')
-                dialogFormVisible.value = false
-                // dialogRef.value.close()
-                loading.value = false
-                disabledBtn.value = false
-              }
-            }).catch(() => {
-              loading.value = false
-              disabledBtn.value = false
-            })
-          }
-        })
+                .then(res => {
+                  if (res.code === 200) {
+                    ElMessage.success('新建点位成功')
+                    emits(
+                      'confirm',
+                      {
+                        ...dataForm.value,
+                        deptName: deptRef.value.fetchDeptTree().length
+                          ? deptRef.value
+                              .fetchDeptTree()
+                              .filter(
+                                (item: any) => item.id === dataForm.value.deptid
+                              ).name
+                          : '',
+                        latGaode: dataForm.value.latitude,
+                        lngGaode: dataForm.value.longitude,
+                        id: res.data
+                      },
+                      'single'
+                    )
+                    dialogFormVisible.value = false
+                    // dialogRef.value.close()
+                    loading.value = false
+                    disabledBtn.value = false
+                  }
+                })
+                .catch(() => {
+                  loading.value = false
+                  disabledBtn.value = false
+                })
+            }
+          })
           .catch(() => {
             disabledBtn.value = false
           })
-
       }
     })
-  }
-  else {
+  } else {
     if (select.value === -1) {
       ElMessage.warning('请选择数据')
       return
@@ -385,14 +443,14 @@
 const locationTypeList = ref<{ id: string; name: string; value: string }[]>([])
 // 获取字典
 const fetchDict = () => {
-  getPiePleListPage({ offset: 1, limit: 99999 }).then((res) => {
+  getPiePleListPage({ offset: 1, limit: 99999 }).then(res => {
     pipeList.value = res.data.rows.map((item: any) => ({
       name: item.pipeCode,
       id: item.pipeCode,
-      value: item.pipeCode,
+      value: item.pipeCode
     }))
   })
-  getDictByCode('locationType').then((res) => {
+  getDictByCode('locationType').then(res => {
     locationTypeList.value = res.data
   })
 }
@@ -401,64 +459,152 @@
 // 编辑临时点位
 const editRef = ref()
 const editRow = (row: any) => {
-    // console.log(row, '111')
-    editRef.value.initDialog('edit', row)
+  // console.log(row, '111')
+  editRef.value.initDialog('edit', row)
 }
 </script>
 
 <template>
-  <el-dialog ref="dialogRef" v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
+  <el-dialog
+    ref="dialogRef"
+    v-model="dialogFormVisible"
+    title="选择安装位置"
+    append-to-body
+    width="70%"
+  >
     <addDialog ref="editRef" @refresh="fetchData" />
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane v-loading="loading" label="新建/编辑点位" name="新建点位">
-        <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
+        <el-form
+          ref="dataFormRef"
+          :rules="rules"
+          :model="dataForm"
+          label-position="right"
+          label-width="80px"
+        >
           <el-row :gutter="24">
             <el-col :span="6">
               <el-form-item label="安装位号" prop="tagNumber">
-                <el-input v-model.trim="dataForm.tagNumber" type="text" placeholder="安装位号" style="width: 100%;"
-                  clearable />
+                <el-input
+                  v-model.trim="dataForm.tagNumber"
+                  type="text"
+                  placeholder="安装位号"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="位置类别">
-                <el-select v-model="dataForm.locationCategory" placeholder="位置类别" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in locationTypeList" :key="item.id" :label="item.name" :value="item.value" />
+                <el-select
+                  v-model="dataForm.locationCategory"
+                  placeholder="位置类别"
+                  style="width: 100%"
+                  clearable
+                  filterable
+                >
+                  <el-option
+                    v-for="item in locationTypeList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.value"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="关联管线">
-                <el-select v-model="dataForm.pipeCode" placeholder="关联管线" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in pipeList" :key="item.id" :label="item.name" :value="item.value" />
+                <el-select
+                  v-model="dataForm.pipeCode"
+                  placeholder="关联管线"
+                  style="width: 100%"
+                  clearable
+                  filterable
+                >
+                  <el-option
+                    v-for="item in pipeList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.value"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="管理单位" prop="deptid">
-                <dept-select ref="deptRef" v-model="dataForm.deptid" placeholder="管理单位" :clearable="true"
-                  style="width: 100%;" />
+                <dept-select
+                  ref="deptRef"
+                  v-model="dataForm.deptid"
+                  placeholder="管理单位"
+                  :clearable="true"
+                  style="width: 100%"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="8">
               <el-form-item label="详细位置" prop="position">
-                <el-input v-model.trim="dataForm.position" type="textarea" :rows="6" placeholder="详细位置"
-                  style="width: 100%;" clearable />
+                <el-input
+                  v-model.trim="dataForm.position"
+                  type="textarea"
+                  :rows="6"
+                  placeholder="详细位置"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
               <el-form-item label="经度" prop="longitude">
-                <el-input v-model.trim="dataForm.longitude" type="text" placeholder="经度" style="width: 100%;"
-                  clearable />
+                <el-input
+                  v-model.trim="dataForm.longitude"
+                  type="text"
+                  placeholder="经度"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
               <el-form-item label="纬度" prop="latitude">
-                <el-input v-model.trim="dataForm.latitude" type="text" placeholder="纬度" style="width: 100%;"
-                  clearable />
+                <el-input
+                  v-model.trim="dataForm.latitude"
+                  type="text"
+                  placeholder="纬度"
+                  style="width: 100%"
+                  clearable
+                />
+              </el-form-item>
+              <el-form-item label="负责人" prop="propertyPerson">
+                <el-input
+                  v-model.trim="dataForm.propertyPerson"
+                  type="text"
+                  placeholder="负责人"
+                  style="width: 100%"
+                  clearable
+                />
+              </el-form-item>
+              <el-form-item label="联系电话" prop="propertyPhone">
+                <el-input
+                  v-model.trim="dataForm.propertyPhone"
+                  type="text"
+                  placeholder="联系电话"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
             </el-col>
-            <el-col :span="16" v-if="dialogFormVisible && activeName === '新建点位'">
+            <el-col
+              :span="16"
+              v-if="dialogFormVisible && activeName === '新建点位'"
+            >
               <!-- 地图 -->
-              <a-map ref="mapRef" :show-pieple-layer="true" :center="mapCenter" :zoom="14" @complete="completeMap"
-                @map-click="mapClick" style="width: 100%; height: 240px;" />
+              <a-map
+                ref="mapRef"
+                :show-pieple-layer="true"
+                :center="mapCenter"
+                :zoom="14"
+                @complete="completeMap"
+                @map-click="mapClick"
+                style="width: 100%; height: 340px"
+              />
             </el-col>
           </el-row>
         </el-form>
@@ -466,39 +612,78 @@
       <el-tab-pane label="既有位置" name="既有位置">
         <search-area :need-clear="true" @search="fetchData" @clear="reset">
           <search-item>
-            <el-input v-model.trim="listQuery.tagNumber" placeholder="安装位号" clearable style="width: 162px;" />
+            <el-input
+              v-model.trim="listQuery.tagNumber"
+              placeholder="安装位号"
+              clearable
+              style="width: 162px"
+            />
           </search-item>
           <search-item>
-            <el-input v-model.trim="listQuery.pipeCode" placeholder="管线编号" clearable style="width: 162px;" />
+            <el-input
+              v-model.trim="listQuery.pipeCode"
+              placeholder="管线编号"
+              clearable
+              style="width: 162px"
+            />
           </search-item>
           <search-item>
-            <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 162px;" />
+            <dept-select
+              v-model="listQuery.deptId"
+              placeholder="管理单位"
+              :clearable="true"
+              style="width: 162px"
+            />
           </search-item>
           <search-item>
-            <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 162px;" />
+            <el-input
+              v-model.trim="listQuery.position"
+              placeholder="详细位置"
+              clearable
+              style="width: 162px"
+            />
           </search-item>
         </search-area>
         <table-container>
           <!-- 查询结果Table显示 -->
-          <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-            @change="changePage">
+          <normal-table
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loadingTable"
+            @change="changePage"
+          >
             <template #preColumns>
               <el-table-column label="选择" width="55" align="center">
                 <template #default="scope">
-                  <el-radio v-model="select" :label="scope.$index" class="radio" />
+                  <el-radio
+                    v-model="select"
+                    :label="scope.$index"
+                    class="radio"
+                  />
                 </template>
               </el-table-column>
               <el-table-column label="序号" width="75" align="center">
                 <template #default="scope">
-                  {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+                  {{
+                    ((listQuery.offset as number) - 1) *
+                      (listQuery.limit as number) +
+                    scope.$index +
+                    1
+                  }}
                 </template>
               </el-table-column>
             </template>
             <template #columns>
-
               <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
-                  <el-button type="primary" link size="small" @click="editRow(scope.row)">
+                  <el-button
+                    type="primary"
+                    link
+                    size="small"
+                    @click="editRow(scope.row)"
+                  >
                     编辑
                   </el-button>
                 </template>
@@ -510,12 +695,15 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button :loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button
+          :loading="disabledBtn"
+          :disabled="disabledBtn"
+          type="primary"
+          @click="saveData"
+        >
           确认
         </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <el-button @click="cancel"> 取消 </el-button>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index d8a00bf..c348409 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -30,6 +30,8 @@
   deptid: '', // 管理单位
   ledgerName: '', // 闸井名称
   locationCategory: '',
+    propertyPerson: '',
+  propertyPhone: '',
 }) // 表单
 const listQueryTemporary = ref({
   tagNumber: '', // 安装位号
@@ -110,7 +112,10 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
   { text: '更新时间', value: 'ts', align: 'center' },
+    { text: '负责人', value: 'propertyPerson', align: 'center', width: '100' },
+  { text: '联系电话', value: 'propertyPhone', align: 'center', width: '120' },
   // { text: '操作人', value: 'position', align: 'center' },
+
 ])
 const loadingTable = ref(true)
 const loadingTableTemporary = ref(false)
@@ -222,7 +227,7 @@
 const tableRef = ref()
 const tableRef1 = ref()
 const initDialog = (row: any) => {
-  console.log(row, 'row')
+  // console.log(row, 'row')
   multiSelectData.value = []
   tableRef.value?.clearMulti()
   dialogFormVisible.value = true
@@ -237,6 +242,8 @@
     deptid: '', // 管理单位
     ledgerName: '', // 闸井名称
     locationCategory: '',
+      propertyPerson: '',
+  propertyPhone: '',
   }
   if (row.tagNumber && row.deptid) {
     // 找到绑定关系
@@ -279,6 +286,8 @@
               deptid: row.deptid,
               ledgerName: row.ledgerName,
               locationCategory: res.data.rows[0].locationCategory,
+              propertyPerson: res.data.rows[0].propertyPerson,
+              propertyPhone: res.data.rows[0].propertyPhone,
             }
           }
           else {
@@ -359,7 +368,7 @@
         disabledBtn.value = true
         loading.value = true
         // 先查找是否还有该点位
-        getSyncListPage({ tagNumber: dataForm.value.tagNumber, deptId: dataForm.value.deptid, limit: 1, offset: 1, type: 1 }).then((res) => {
+        getSyncListPage({ tagNumber: dataForm.value.tagNumber, limit: 1, offset: 1, type: 1 }).then((res) => {
           if (res.data.rows.length) {
             disabledBtn.value = false
             //  已经含有
@@ -399,6 +408,8 @@
                 id: data.id,
                 type: '1',
                 locationCategory: dataForm.value.locationCategory,
+                propertyPerson: dataForm.value.propertyPerson,
+                propertyPhone: dataForm.value.propertyPhone,
               }).then((res) => {
                 ElMessage.success('编辑点位成功')
                 emits('confirm', result, 'single')
@@ -426,6 +437,8 @@
               tagNumber: dataForm.value.tagNumber,
               type: '1',
               locationCategory: dataForm.value.locationCategory,
+              propertyPerson: dataForm.value.propertyPerson,
+                propertyPhone: dataForm.value.propertyPhone,
             }).then((res) => {
               ElMessage.success('新建点位成功')
 
@@ -645,11 +658,17 @@
                 <el-input v-model.trim="dataForm.latitude" type="text" placeholder="纬度" style="width: 100%;"
                   clearable />
               </el-form-item>
+              <el-form-item label="负责人" prop="propertyPerson">
+            <el-input v-model.trim="dataForm.propertyPerson" type="text" placeholder="负责人" style="width: 100%;" clearable />
+          </el-form-item>
+          <el-form-item label="联系电话" prop="propertyPhone">
+            <el-input v-model.trim="dataForm.propertyPhone" type="text" placeholder="联系电话" style="width: 100%;" clearable />
+          </el-form-item>
             </el-col>
             <el-col v-if="activeName === '新建点位'" :span="16">
               <!-- 地图 -->
               <a-map ref="mapRef" :show-pieple-layer="true" :center="mapCenter" :zoom="14"
-                style="width: 100%; height: 240px;" @complete="completeMap" @map-click="mapClick" />
+                style="width: 100%; height: 340px;" @complete="completeMap" @map-click="mapClick" />
             </el-col>
           </el-row>
         </el-form>

diff --git a/public/config/config.json b/public/config/config.json
index 22f4711..1053b40 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://111.198.10.15:11643",
+  "baseUrl": "http://10.30.7.26:20705",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/api/home/alarm/current.ts b/src/api/home/alarm/current.ts
index cc36a2f..d1a2ed1 100644
--- a/src/api/home/alarm/current.ts
+++ b/src/api/home/alarm/current.ts
@@ -67,6 +67,16 @@
     },
   })
 }
+// 手动消警
+export function batchHandDelete(codes: any) {
+  return request({
+    url: '/system/alarmRecords/cancelAlarmByLedgerNumber',
+    method: 'post',
+    data: {
+      codes,
+    },
+  })
+}
 export function exportCurrentAlarm(data: any) {
   return request({
     url: '/system/alarmRecords/batchExport',
diff --git a/src/components.d.ts b/src/components.d.ts
index b6e680f..003b04b 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,21 +74,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
-    VanBackTop: typeof import('vant/es')['BackTop']
-    VanCell: typeof import('vant/es')['Cell']
-    VanCellGroup: typeof import('vant/es')['CellGroup']
-    VanDatePicker: typeof import('vant/es')['DatePicker']
-    VanDialog: typeof import('vant/es')['Dialog']
-    VanEmpty: typeof import('vant/es')['Empty']
-    VanField: typeof import('vant/es')['Field']
-    VanForm: typeof import('vant/es')['Form']
-    VanIcon: typeof import('vant/es')['Icon']
-    VanPicker: typeof import('vant/es')['Picker']
-    VanPickerGroup: typeof import('vant/es')['PickerGroup']
-    VanPopup: typeof import('vant/es')['Popup']
-    VanRadio: typeof import('vant/es')['Radio']
-    VanRadioGroup: typeof import('vant/es')['RadioGroup']
-    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index f0cadbc..c649738 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -186,6 +186,20 @@
         }
       }
     })
+    // 处理挂起结束
+    const pending = alarmDynamics.value.find((item: any) => item.process_name === '挂起' && item.confirmValue)
+    if(pending) {
+     const pendingIndex = alarmDynamics.value.findIndex((item: any) => item.process_name === '挂起' && item.confirmValue)
+     // 上一个状态
+     const lastStatus = alarmDynamics.value[pendingIndex - 1]
+     alarmDynamics.value.splice(pendingIndex+ 1, 1, {
+      process_name: `挂起时间到，状态改为${lastStatus?.process_name || ' '}`,
+      approvalTime: pending.confirmValue,
+      approvalPerson: '',
+      dept_name: '',
+      name: ''
+     })
+    }
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 69fae06..fab569f 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -8,7 +8,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-import { batchDelete, detailAlarm, exportCurrentAlarm, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
+import { batchDelete, batchHandDelete, detailAlarm, exportCurrentAlarm, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
 import { getStationListPage } from '@/api/home/station/station'
 import { getDictByCode } from '@/api/system/dict'
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
@@ -547,6 +547,31 @@
     })
   })
 }
+// 手动消警
+const handAlarm = () => {
+  if (!multipleTable.value.length) {
+    ElMessage.warning('请先选中数据')
+    return
+  }
+   ElMessageBox.confirm(
+    '确定要消除选中的数据吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(res => {
+    batchHandDelete(multipleTable.value.map((item: any) => item.ledgerNumber)).then(res => {
+      ElMessage.success('操作成功')
+      // 清空多选
+      multipleTable.value = []
+      tableRef.value.clearMulti()
+      fetchData()
+    })
+  })
+}
+// batchHandDelete
 // 跳转设备详情
 const toDeviceDetail = (row: any) => {
   if (!row.devcode || !row.devTypeName) {
@@ -779,6 +804,9 @@
           <template #btns-right>
             <!-- 操作 -->
             <div>
+              <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="handAlarm">
+                手动消警
+              </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量处置
               </el-button>
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index f710718..43a1f5b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -7,7 +7,11 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormRules, TabsPaneContext } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
-import { addPosition, editPosition, getPositionListPage } from '@/api/home/device/device'
+import {
+  addPosition,
+  editPosition,
+  getPositionListPage
+} from '@/api/home/device/device'
 import { getPiePleListPage } from '@/api/home/ledger/pipeline'
 import AMap from '@/components/map/index.vue'
 // import { getDictByCode } from '@/api/system/dict'
@@ -30,14 +34,28 @@
   deptid: '', // 管理单位
   pipeCode: '', // 关联管线
   locationCategory: '',
+  propertyPerson: '',
+  propertyPhone: '',
 }) // 表单
 const rules: FormRules = {
-  tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
-  longitude: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
-  latitude: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }],
-  position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
-  deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
-  pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
+  tagNumber: [
+    { required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }
+  ],
+  longitude: [
+    { required: true, message: '经度不能为空', trigger: ['blur', 'change'] }
+  ],
+  latitude: [
+    { required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }
+  ],
+  position: [
+    { required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }
+  ],
+  deptid: [
+    { required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }
+  ],
+  pipeCode: [
+    { required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }
+  ]
 } // 前端校验规则
 
 const mapRef = ref()
@@ -53,11 +71,14 @@
 // 地图加载完成
 const completeMap = () => {
   if (dataForm.value.longitude && dataForm.value.latitude) {
-    mapRef.value.map?.setCenter([dataForm.value.longitude, dataForm.value.latitude])
+    mapRef.value.map?.setCenter([
+      dataForm.value.longitude,
+      dataForm.value.latitude
+    ])
     mapRef.value.addMarker({
       position: [dataForm.value.longitude, dataForm.value.latitude],
       content: '',
-      label: '',
+      label: ''
     })
   }
   // 加载中心点marker
@@ -80,7 +101,7 @@
   mapRef.value.addMarker({
     position: location,
     content: '',
-    label: '',
+    label: ''
   })
   // 填充坐标信息
   dataForm.value.longitude = e.lnglat.getLng()
@@ -101,6 +122,8 @@
   { text: '管线编号', value: 'pipeCode', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
+      { text: '负责人', value: 'propertyPerson', align: 'center', width: '100' },
+  { text: '联系电话', value: 'propertyPhone', align: 'center', width: '120' },
 ])
 const loadingTable = ref(true)
 //  查询条件
@@ -110,18 +133,20 @@
   tagNumber: '', // 位号
   pipeCode: '', // 编号
   deptId: '', // 管理单位
-  position: '', // 详细位置
+  position: '' // 详细位置
 } as { [key: string]: string | number })
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  getPositionListPage(listQuery.value).then((res) => {
-    list.value = res.data.rows
-    total.value = res.data.total
-    loadingTable.value = false
-  }).catch(() => {
-    loadingTable.value = false
-  })
+  getPositionListPage(listQuery.value)
+    .then(res => {
+      list.value = res.data.rows
+      total.value = res.data.total
+      loadingTable.value = false
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
 }
 fetchData()
 // 重置查询条件f
@@ -132,7 +157,7 @@
     tagNumber: '', // 位号
     pipeCode: '', // 编号
     deptId: '', // 管理单位
-    position: '', // 详细位置
+    position: '' // 详细位置
   }
   fetchData()
 }
@@ -157,49 +182,58 @@
   if (row.tagNumber && row.deptid) {
     // console.log('找到绑定关系')
     loading.value = true
-    getPositionListPage({ tagNumber: row.tagNumber, deptid: row.deptid, offset: 1, limit: 1 }).then(res => {
-      if (res.data.rows.length) {
-        if (Boolean(res.data.rows[0].lngGaode && res.data.rows[0].latGaode)) {
-          const location = [res.data.rows[0].lngGaode, res.data.rows[0].latGaode]
-          mapRef.value.removeMarker()
-          mapRef.value.addMarker({
-            position: location,
-            content: '',
-            label: '',
-          })
-          dataForm.value.longitude = res.data.rows[0].lngGaode
-          dataForm.value.latitude = res.data.rows[0].latGaode
-          mapRef.value.map.setCenter(location)
-          // mapRef.value.map.setZoom(9)
-          // setTimeout(() => {
-          //   mapRef.value.map.setZoom(14)
-          // }, 500)
-        }
-        else {
+    getPositionListPage({
+      tagNumber: row.tagNumber,
+      deptid: row.deptid,
+      offset: 1,
+      limit: 1
+    })
+      .then(res => {
+        if (res.data.rows.length) {
+          if (Boolean(res.data.rows[0].lngGaode && res.data.rows[0].latGaode)) {
+            const location = [
+              res.data.rows[0].lngGaode,
+              res.data.rows[0].latGaode
+            ]
+            mapRef.value.removeMarker()
+            mapRef.value.addMarker({
+              position: location,
+              content: '',
+              label: ''
+            })
+            dataForm.value.longitude = res.data.rows[0].lngGaode
+            dataForm.value.latitude = res.data.rows[0].latGaode
+            mapRef.value.map.setCenter(location)
+            // mapRef.value.map.setZoom(9)
+            // setTimeout(() => {
+            //   mapRef.value.map.setZoom(14)
+            // }, 500)
+          } else {
+            mapRef.value.removeMarker()
+            dataForm.value.longitude = ''
+            dataForm.value.latitude = ''
+            // mapRef.value.map.setCenter([])
+            ElMessage.warning('该点位缺少坐标位置，请选择坐标位置')
+          }
+          dataForm.value.position = res.data.rows[0].position
+          dataForm.value.deptid = row.deptid
+          dataForm.value.tagNumber = row.tagNumber
+          dataForm.value.pipeCode = res.data.rows[0].pipeCode
+          dataForm.value.propertyPerson = res.data.rows[0].propertyPerson
+          dataForm.value.propertyPhone = res.data.rows[0].propertyPhone
+        } else {
           mapRef.value.removeMarker()
           dataForm.value.longitude = ''
           dataForm.value.latitude = ''
-          // mapRef.value.map.setCenter([])
+          dataForm.value.position = ''
           ElMessage.warning('该点位缺少坐标位置，请选择坐标位置')
         }
-        dataForm.value.position = res.data.rows[0].position
-        dataForm.value.deptid = row.deptid
-        dataForm.value.tagNumber = row.tagNumber
-        dataForm.value.pipeCode = res.data.rows[0].pipeCode
-      }
-      else {
-        mapRef.value.removeMarker()
-        dataForm.value.longitude = ''
-        dataForm.value.latitude = ''
-        dataForm.value.position = ''
-        ElMessage.warning('该点位缺少坐标位置，请选择坐标位置')
-      }
-      loading.value = false
-    }).catch(() => {
-      loading.value = false
-    })
-  }
-  else {
+        loading.value = false
+      })
+      .catch(() => {
+        loading.value = false
+      })
+  } else {
     loading.value = false
     // console.log('没有找到绑定关系')
     dataForm.value.longitude = ''
@@ -208,6 +242,8 @@
     dataForm.value.deptid = ''
     dataForm.value.tagNumber = ''
     dataForm.value.pipeCode = ''
+    dataForm.value.propertyPerson = ''
+    dataForm.value.propertyPhone = ''
     // 判断是否同意获取当前位置
     const setInfo = (longitude: string | number, latitude: string | number) => {
       mapRef.value.map.setCenter([longitude, latitude])
@@ -224,44 +260,49 @@
       mapRef.value.addMarker({
         position: [longitude, latitude],
         content: '',
-        label: '',
+        label: ''
       })
     }
     setTimeout(() => {
-      mapRef.value.getLocation((position: any) => {
-        // console.log(position, 'positon')
-        // console.log(position.position.lng, 'positon.positon.lng')
-        setTimeout(() => {
-          setInfo(position.position.lng, position.position.lat)
-        })
-      }, () => {
-        if (!sessionStorage.getItem('longitude')) {
-          getLocation()
+      mapRef.value.getLocation(
+        (position: any) => {
+          // console.log(position, 'positon')
+          // console.log(position.position.lng, 'positon.positon.lng')
           setTimeout(() => {
-            if (sessionStorage.getItem('longitude')) {
-              setInfo(sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string)
-            }
-            else {
-              mapRef.value.map.setCenter(['116.397428', '39.90923'])
-              // mapRef.value.map.setZoom(9)
-              // setTimeout(() => {
-              //   mapRef.value.map.setZoom(14)
-              // }, 500)
-            }
+            setInfo(position.position.lng, position.position.lat)
           })
+        },
+        () => {
+          if (!sessionStorage.getItem('longitude')) {
+            getLocation()
+            setTimeout(() => {
+              if (sessionStorage.getItem('longitude')) {
+                setInfo(
+                  sessionStorage.getItem('longitude') as string,
+                  sessionStorage.getItem('latitude') as string
+                )
+              } else {
+                mapRef.value.map.setCenter(['116.397428', '39.90923'])
+                // mapRef.value.map.setZoom(9)
+                // setTimeout(() => {
+                //   mapRef.value.map.setZoom(14)
+                // }, 500)
+              }
+            })
+          } else {
+            setInfo(
+              sessionStorage.getItem('longitude') as string,
+              sessionStorage.getItem('latitude') as string
+            )
+          }
         }
-        else {
-          setInfo(sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string)
-        }
-      })
+      )
     })
-
   }
-
 }
 const dialogRef = ref()
 defineExpose({
-  initDialog,
+  initDialog
 })
 // 保存数据
 const deptRef = ref()
@@ -273,100 +314,117 @@
         // 先查询是否含有该位号
         getPositionListPage({
           tagNumber: dataForm.value.tagNumber,
-          deptid: dataForm.value.deptid,
-          offset: 1, limit: 1
-        }).then(res => {
-          disabledBtn.value = false
-          if (res.data.rows.length) {
-            //  已经含有
-            ElMessageBox.confirm(
-              '该点位已经存在，确认编辑该点位信息?',
-              '提示',
-              {
-                confirmButtonText: '确认',
-                cancelButtonText: '取消',
-                type: 'warning',
-              }
-            ).then(() => {
+          // deptid: dataForm.value.deptid,
+          offset: 1,
+          limit: 1
+        })
+          .then(res => {
+            disabledBtn.value = false
+            if (res.data.rows.length) {
+              //  已经含有
+              ElMessageBox.confirm(
+                '该点位已经存在，确认编辑该点位信息?',
+                '提示',
+                {
+                  confirmButtonText: '确认',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+                }
+              ).then(() => {
+                loading.value = true
+                const data = res.data.rows[0]
+                const result = {
+                  deptName: data.deptName,
+                  latGaode: data.latGaode,
+                  lngGaode: data.lngGaode,
+                  // pipeCode: data.pipeCode,
+                  // deptid: data.deptid,
+                  // position: data.position,
+                  // tagNumber: data.tagNumber,
+                  // longitude: data.lngGaode, // 经度
+                  // latitude: data.latGaode, // 纬度
+                  id: data.id,
+                  ...dataForm.value
+                }
+                disabledBtn.value = true
+                editPosition({
+                  deptid: dataForm.value.deptid,
+                  latGaode: dataForm.value.latitude,
+                  lngGaode: dataForm.value.longitude,
+                  pipeCode: dataForm.value.pipeCode,
+                  position: dataForm.value.position,
+                  tagNumber: dataForm.value.tagNumber,
+                  id: data.id,
+                  type: '3',
+                  locationCategory: dataForm.value.locationCategory,
+                  propertyPerson: dataForm.value.propertyPerson,
+                  propertyPhone: dataForm.value.propertyPhone,
+                })
+                  .then(res => {
+                    ElMessage.success('编辑点位成功')
+                    emits('confirm', result, 'single')
+                    dialogFormVisible.value = false
+                    loading.value = false
+                    disabledBtn.value = false
+                  })
+                  .catch(() => {
+                    loading.value = false
+                    disabledBtn.value = false
+                  })
+              })
+            } else {
               loading.value = true
-              const data = res.data.rows[0]
-              const result = {
-                deptName: data.deptName,
-                latGaode: data.latGaode,
-                lngGaode: data.lngGaode,
-                // pipeCode: data.pipeCode,
-                // deptid: data.deptid,
-                // position: data.position,
-                // tagNumber: data.tagNumber,
-                // longitude: data.lngGaode, // 经度
-                // latitude: data.latGaode, // 纬度
-                id: data.id,
-                ...dataForm.value,
-              }
               disabledBtn.value = true
-              editPosition({
+              addPosition({
                 deptid: dataForm.value.deptid,
                 latGaode: dataForm.value.latitude,
                 lngGaode: dataForm.value.longitude,
                 pipeCode: dataForm.value.pipeCode,
                 position: dataForm.value.position,
                 tagNumber: dataForm.value.tagNumber,
-                id: data.id,
                 type: '3',
-                locationCategory: dataForm.value.locationCategory
-              }).then(res => {
-                ElMessage.success('编辑点位成功')
-                emits('confirm', result, 'single')
-                dialogFormVisible.value = false
-                loading.value = false
-                disabledBtn.value = false
-              }).catch(() => {
-                loading.value = false
-                disabledBtn.value = false
+                locationCategory: dataForm.value.locationCategory,
+                propertyPerson: dataForm.value.propertyPerson,
+                  propertyPhone: dataForm.value.propertyPhone,
               })
-            })
-          }
-          else {
-            loading.value = true
-            disabledBtn.value = true
-            addPosition({
-              deptid: dataForm.value.deptid,
-              latGaode: dataForm.value.latitude,
-              lngGaode: dataForm.value.longitude,
-              pipeCode: dataForm.value.pipeCode,
-              position: dataForm.value.position,
-              tagNumber: dataForm.value.tagNumber,
-              type: '3',
-              locationCategory: dataForm.value.locationCategory
-            }).then((res) => {
-              if (res.code === 200) {
-                ElMessage.success('新建点位成功')
-                emits('confirm', {
-                  ...dataForm.value,
-                  deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
-                  latGaode: dataForm.value.latitude,
-                  lngGaode: dataForm.value.longitude,
-                  id: res.data,
-                }, 'single')
-                dialogFormVisible.value = false
-                // dialogRef.value.close()
-                loading.value = false
-                disabledBtn.value = false
-              }
-            }).catch(() => {
-              loading.value = false
-              disabledBtn.value = false
-            })
-          }
-        })
+                .then(res => {
+                  if (res.code === 200) {
+                    ElMessage.success('新建点位成功')
+                    emits(
+                      'confirm',
+                      {
+                        ...dataForm.value,
+                        deptName: deptRef.value.fetchDeptTree().length
+                          ? deptRef.value
+                              .fetchDeptTree()
+                              .filter(
+                                (item: any) => item.id === dataForm.value.deptid
+                              ).name
+                          : '',
+                        latGaode: dataForm.value.latitude,
+                        lngGaode: dataForm.value.longitude,
+                        id: res.data
+                      },
+                      'single'
+                    )
+                    dialogFormVisible.value = false
+                    // dialogRef.value.close()
+                    loading.value = false
+                    disabledBtn.value = false
+                  }
+                })
+                .catch(() => {
+                  loading.value = false
+                  disabledBtn.value = false
+                })
+            }
+          })
           .catch(() => {
             disabledBtn.value = false
           })
-
       }
     })
-  }
-  else {
+  } else {
     if (select.value === -1) {
       ElMessage.warning('请选择数据')
       return
@@ -385,14 +443,14 @@
 const locationTypeList = ref<{ id: string; name: string; value: string }[]>([])
 // 获取字典
 const fetchDict = () => {
-  getPiePleListPage({ offset: 1, limit: 99999 }).then((res) => {
+  getPiePleListPage({ offset: 1, limit: 99999 }).then(res => {
     pipeList.value = res.data.rows.map((item: any) => ({
       name: item.pipeCode,
       id: item.pipeCode,
-      value: item.pipeCode,
+      value: item.pipeCode
     }))
   })
-  getDictByCode('locationType').then((res) => {
+  getDictByCode('locationType').then(res => {
     locationTypeList.value = res.data
   })
 }
@@ -401,64 +459,152 @@
 // 编辑临时点位
 const editRef = ref()
 const editRow = (row: any) => {
-    // console.log(row, '111')
-    editRef.value.initDialog('edit', row)
+  // console.log(row, '111')
+  editRef.value.initDialog('edit', row)
 }
 </script>
 
 <template>
-  <el-dialog ref="dialogRef" v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
+  <el-dialog
+    ref="dialogRef"
+    v-model="dialogFormVisible"
+    title="选择安装位置"
+    append-to-body
+    width="70%"
+  >
     <addDialog ref="editRef" @refresh="fetchData" />
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane v-loading="loading" label="新建/编辑点位" name="新建点位">
-        <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
+        <el-form
+          ref="dataFormRef"
+          :rules="rules"
+          :model="dataForm"
+          label-position="right"
+          label-width="80px"
+        >
           <el-row :gutter="24">
             <el-col :span="6">
               <el-form-item label="安装位号" prop="tagNumber">
-                <el-input v-model.trim="dataForm.tagNumber" type="text" placeholder="安装位号" style="width: 100%;"
-                  clearable />
+                <el-input
+                  v-model.trim="dataForm.tagNumber"
+                  type="text"
+                  placeholder="安装位号"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="位置类别">
-                <el-select v-model="dataForm.locationCategory" placeholder="位置类别" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in locationTypeList" :key="item.id" :label="item.name" :value="item.value" />
+                <el-select
+                  v-model="dataForm.locationCategory"
+                  placeholder="位置类别"
+                  style="width: 100%"
+                  clearable
+                  filterable
+                >
+                  <el-option
+                    v-for="item in locationTypeList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.value"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="关联管线">
-                <el-select v-model="dataForm.pipeCode" placeholder="关联管线" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in pipeList" :key="item.id" :label="item.name" :value="item.value" />
+                <el-select
+                  v-model="dataForm.pipeCode"
+                  placeholder="关联管线"
+                  style="width: 100%"
+                  clearable
+                  filterable
+                >
+                  <el-option
+                    v-for="item in pipeList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.value"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="管理单位" prop="deptid">
-                <dept-select ref="deptRef" v-model="dataForm.deptid" placeholder="管理单位" :clearable="true"
-                  style="width: 100%;" />
+                <dept-select
+                  ref="deptRef"
+                  v-model="dataForm.deptid"
+                  placeholder="管理单位"
+                  :clearable="true"
+                  style="width: 100%"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="8">
               <el-form-item label="详细位置" prop="position">
-                <el-input v-model.trim="dataForm.position" type="textarea" :rows="6" placeholder="详细位置"
-                  style="width: 100%;" clearable />
+                <el-input
+                  v-model.trim="dataForm.position"
+                  type="textarea"
+                  :rows="6"
+                  placeholder="详细位置"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
               <el-form-item label="经度" prop="longitude">
-                <el-input v-model.trim="dataForm.longitude" type="text" placeholder="经度" style="width: 100%;"
-                  clearable />
+                <el-input
+                  v-model.trim="dataForm.longitude"
+                  type="text"
+                  placeholder="经度"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
               <el-form-item label="纬度" prop="latitude">
-                <el-input v-model.trim="dataForm.latitude" type="text" placeholder="纬度" style="width: 100%;"
-                  clearable />
+                <el-input
+                  v-model.trim="dataForm.latitude"
+                  type="text"
+                  placeholder="纬度"
+                  style="width: 100%"
+                  clearable
+                />
+              </el-form-item>
+              <el-form-item label="负责人" prop="propertyPerson">
+                <el-input
+                  v-model.trim="dataForm.propertyPerson"
+                  type="text"
+                  placeholder="负责人"
+                  style="width: 100%"
+                  clearable
+                />
+              </el-form-item>
+              <el-form-item label="联系电话" prop="propertyPhone">
+                <el-input
+                  v-model.trim="dataForm.propertyPhone"
+                  type="text"
+                  placeholder="联系电话"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
             </el-col>
-            <el-col :span="16" v-if="dialogFormVisible && activeName === '新建点位'">
+            <el-col
+              :span="16"
+              v-if="dialogFormVisible && activeName === '新建点位'"
+            >
               <!-- 地图 -->
-              <a-map ref="mapRef" :show-pieple-layer="true" :center="mapCenter" :zoom="14" @complete="completeMap"
-                @map-click="mapClick" style="width: 100%; height: 240px;" />
+              <a-map
+                ref="mapRef"
+                :show-pieple-layer="true"
+                :center="mapCenter"
+                :zoom="14"
+                @complete="completeMap"
+                @map-click="mapClick"
+                style="width: 100%; height: 340px"
+              />
             </el-col>
           </el-row>
         </el-form>
@@ -466,39 +612,78 @@
       <el-tab-pane label="既有位置" name="既有位置">
         <search-area :need-clear="true" @search="fetchData" @clear="reset">
           <search-item>
-            <el-input v-model.trim="listQuery.tagNumber" placeholder="安装位号" clearable style="width: 162px;" />
+            <el-input
+              v-model.trim="listQuery.tagNumber"
+              placeholder="安装位号"
+              clearable
+              style="width: 162px"
+            />
           </search-item>
           <search-item>
-            <el-input v-model.trim="listQuery.pipeCode" placeholder="管线编号" clearable style="width: 162px;" />
+            <el-input
+              v-model.trim="listQuery.pipeCode"
+              placeholder="管线编号"
+              clearable
+              style="width: 162px"
+            />
           </search-item>
           <search-item>
-            <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 162px;" />
+            <dept-select
+              v-model="listQuery.deptId"
+              placeholder="管理单位"
+              :clearable="true"
+              style="width: 162px"
+            />
           </search-item>
           <search-item>
-            <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 162px;" />
+            <el-input
+              v-model.trim="listQuery.position"
+              placeholder="详细位置"
+              clearable
+              style="width: 162px"
+            />
           </search-item>
         </search-area>
         <table-container>
           <!-- 查询结果Table显示 -->
-          <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-            @change="changePage">
+          <normal-table
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loadingTable"
+            @change="changePage"
+          >
             <template #preColumns>
               <el-table-column label="选择" width="55" align="center">
                 <template #default="scope">
-                  <el-radio v-model="select" :label="scope.$index" class="radio" />
+                  <el-radio
+                    v-model="select"
+                    :label="scope.$index"
+                    class="radio"
+                  />
                 </template>
               </el-table-column>
               <el-table-column label="序号" width="75" align="center">
                 <template #default="scope">
-                  {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+                  {{
+                    ((listQuery.offset as number) - 1) *
+                      (listQuery.limit as number) +
+                    scope.$index +
+                    1
+                  }}
                 </template>
               </el-table-column>
             </template>
             <template #columns>
-
               <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
-                  <el-button type="primary" link size="small" @click="editRow(scope.row)">
+                  <el-button
+                    type="primary"
+                    link
+                    size="small"
+                    @click="editRow(scope.row)"
+                  >
                     编辑
                   </el-button>
                 </template>
@@ -510,12 +695,15 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button :loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button
+          :loading="disabledBtn"
+          :disabled="disabledBtn"
+          type="primary"
+          @click="saveData"
+        >
           确认
         </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <el-button @click="cancel"> 取消 </el-button>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index d8a00bf..c348409 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -30,6 +30,8 @@
   deptid: '', // 管理单位
   ledgerName: '', // 闸井名称
   locationCategory: '',
+    propertyPerson: '',
+  propertyPhone: '',
 }) // 表单
 const listQueryTemporary = ref({
   tagNumber: '', // 安装位号
@@ -110,7 +112,10 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
   { text: '更新时间', value: 'ts', align: 'center' },
+    { text: '负责人', value: 'propertyPerson', align: 'center', width: '100' },
+  { text: '联系电话', value: 'propertyPhone', align: 'center', width: '120' },
   // { text: '操作人', value: 'position', align: 'center' },
+
 ])
 const loadingTable = ref(true)
 const loadingTableTemporary = ref(false)
@@ -222,7 +227,7 @@
 const tableRef = ref()
 const tableRef1 = ref()
 const initDialog = (row: any) => {
-  console.log(row, 'row')
+  // console.log(row, 'row')
   multiSelectData.value = []
   tableRef.value?.clearMulti()
   dialogFormVisible.value = true
@@ -237,6 +242,8 @@
     deptid: '', // 管理单位
     ledgerName: '', // 闸井名称
     locationCategory: '',
+      propertyPerson: '',
+  propertyPhone: '',
   }
   if (row.tagNumber && row.deptid) {
     // 找到绑定关系
@@ -279,6 +286,8 @@
               deptid: row.deptid,
               ledgerName: row.ledgerName,
               locationCategory: res.data.rows[0].locationCategory,
+              propertyPerson: res.data.rows[0].propertyPerson,
+              propertyPhone: res.data.rows[0].propertyPhone,
             }
           }
           else {
@@ -359,7 +368,7 @@
         disabledBtn.value = true
         loading.value = true
         // 先查找是否还有该点位
-        getSyncListPage({ tagNumber: dataForm.value.tagNumber, deptId: dataForm.value.deptid, limit: 1, offset: 1, type: 1 }).then((res) => {
+        getSyncListPage({ tagNumber: dataForm.value.tagNumber, limit: 1, offset: 1, type: 1 }).then((res) => {
           if (res.data.rows.length) {
             disabledBtn.value = false
             //  已经含有
@@ -399,6 +408,8 @@
                 id: data.id,
                 type: '1',
                 locationCategory: dataForm.value.locationCategory,
+                propertyPerson: dataForm.value.propertyPerson,
+                propertyPhone: dataForm.value.propertyPhone,
               }).then((res) => {
                 ElMessage.success('编辑点位成功')
                 emits('confirm', result, 'single')
@@ -426,6 +437,8 @@
               tagNumber: dataForm.value.tagNumber,
               type: '1',
               locationCategory: dataForm.value.locationCategory,
+              propertyPerson: dataForm.value.propertyPerson,
+                propertyPhone: dataForm.value.propertyPhone,
             }).then((res) => {
               ElMessage.success('新建点位成功')
 
@@ -645,11 +658,17 @@
                 <el-input v-model.trim="dataForm.latitude" type="text" placeholder="纬度" style="width: 100%;"
                   clearable />
               </el-form-item>
+              <el-form-item label="负责人" prop="propertyPerson">
+            <el-input v-model.trim="dataForm.propertyPerson" type="text" placeholder="负责人" style="width: 100%;" clearable />
+          </el-form-item>
+          <el-form-item label="联系电话" prop="propertyPhone">
+            <el-input v-model.trim="dataForm.propertyPhone" type="text" placeholder="联系电话" style="width: 100%;" clearable />
+          </el-form-item>
             </el-col>
             <el-col v-if="activeName === '新建点位'" :span="16">
               <!-- 地图 -->
               <a-map ref="mapRef" :show-pieple-layer="true" :center="mapCenter" :zoom="14"
-                style="width: 100%; height: 240px;" @complete="completeMap" @map-click="mapClick" />
+                style="width: 100%; height: 340px;" @complete="completeMap" @map-click="mapClick" />
             </el-col>
           </el-row>
         </el-form>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 8eca8b5..67cc516 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -31,7 +31,9 @@
   ledgerName: '',
   type: '3',
   id: '',
-  locationCategory: ''
+  locationCategory: '',
+  propertyPerson: '',
+  propertyPhone: '',
 }) // 表单
 const rules: FormRules = {
   tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
@@ -91,7 +93,9 @@
       ledgerName: '',
       type: '1',
       id: '',
-      locationCategory: ''
+      locationCategory: '',
+      propertyPerson: '',
+      propertyPhone: '',
     }
     dataFormRef.value?.resetFields()
   }
@@ -209,11 +213,17 @@
           <el-form-item label="纬度" prop="latGaode">
             <el-input v-model.trim="dataForm.latGaode" type="text" placeholder="纬度" style="width: 100%;" clearable />
           </el-form-item>
+          <el-form-item label="负责人" prop="propertyPerson">
+            <el-input v-model.trim="dataForm.propertyPerson" type="text" placeholder="负责人" style="width: 100%;" clearable />
+          </el-form-item>
+          <el-form-item label="联系电话" prop="propertyPhone">
+            <el-input v-model.trim="dataForm.propertyPhone" type="text" placeholder="联系电话" style="width: 100%;" clearable />
+          </el-form-item>
         </el-col>
         <el-col :span="16" v-if="dialogFormVisible">
           <!-- 地图 -->
           <a-map ref="mapRef" :show-pieple-layer="true" :center="mapCenter" :zoom="14" @complete="completeMap"
-            @map-click="mapClick" style="width: 100%; height: 240px;" />
+            @map-click="mapClick" style="width: 100%; height: 340px;" />
         </el-col>
       </el-row>
     </el-form>

diff --git a/public/config/config.json b/public/config/config.json
index 22f4711..1053b40 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://111.198.10.15:11643",
+  "baseUrl": "http://10.30.7.26:20705",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/api/home/alarm/current.ts b/src/api/home/alarm/current.ts
index cc36a2f..d1a2ed1 100644
--- a/src/api/home/alarm/current.ts
+++ b/src/api/home/alarm/current.ts
@@ -67,6 +67,16 @@
     },
   })
 }
+// 手动消警
+export function batchHandDelete(codes: any) {
+  return request({
+    url: '/system/alarmRecords/cancelAlarmByLedgerNumber',
+    method: 'post',
+    data: {
+      codes,
+    },
+  })
+}
 export function exportCurrentAlarm(data: any) {
   return request({
     url: '/system/alarmRecords/batchExport',
diff --git a/src/components.d.ts b/src/components.d.ts
index b6e680f..003b04b 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,21 +74,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
-    VanBackTop: typeof import('vant/es')['BackTop']
-    VanCell: typeof import('vant/es')['Cell']
-    VanCellGroup: typeof import('vant/es')['CellGroup']
-    VanDatePicker: typeof import('vant/es')['DatePicker']
-    VanDialog: typeof import('vant/es')['Dialog']
-    VanEmpty: typeof import('vant/es')['Empty']
-    VanField: typeof import('vant/es')['Field']
-    VanForm: typeof import('vant/es')['Form']
-    VanIcon: typeof import('vant/es')['Icon']
-    VanPicker: typeof import('vant/es')['Picker']
-    VanPickerGroup: typeof import('vant/es')['PickerGroup']
-    VanPopup: typeof import('vant/es')['Popup']
-    VanRadio: typeof import('vant/es')['Radio']
-    VanRadioGroup: typeof import('vant/es')['RadioGroup']
-    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index f0cadbc..c649738 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -186,6 +186,20 @@
         }
       }
     })
+    // 处理挂起结束
+    const pending = alarmDynamics.value.find((item: any) => item.process_name === '挂起' && item.confirmValue)
+    if(pending) {
+     const pendingIndex = alarmDynamics.value.findIndex((item: any) => item.process_name === '挂起' && item.confirmValue)
+     // 上一个状态
+     const lastStatus = alarmDynamics.value[pendingIndex - 1]
+     alarmDynamics.value.splice(pendingIndex+ 1, 1, {
+      process_name: `挂起时间到，状态改为${lastStatus?.process_name || ' '}`,
+      approvalTime: pending.confirmValue,
+      approvalPerson: '',
+      dept_name: '',
+      name: ''
+     })
+    }
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 69fae06..fab569f 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -8,7 +8,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-import { batchDelete, detailAlarm, exportCurrentAlarm, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
+import { batchDelete, batchHandDelete, detailAlarm, exportCurrentAlarm, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
 import { getStationListPage } from '@/api/home/station/station'
 import { getDictByCode } from '@/api/system/dict'
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
@@ -547,6 +547,31 @@
     })
   })
 }
+// 手动消警
+const handAlarm = () => {
+  if (!multipleTable.value.length) {
+    ElMessage.warning('请先选中数据')
+    return
+  }
+   ElMessageBox.confirm(
+    '确定要消除选中的数据吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(res => {
+    batchHandDelete(multipleTable.value.map((item: any) => item.ledgerNumber)).then(res => {
+      ElMessage.success('操作成功')
+      // 清空多选
+      multipleTable.value = []
+      tableRef.value.clearMulti()
+      fetchData()
+    })
+  })
+}
+// batchHandDelete
 // 跳转设备详情
 const toDeviceDetail = (row: any) => {
   if (!row.devcode || !row.devTypeName) {
@@ -779,6 +804,9 @@
           <template #btns-right>
             <!-- 操作 -->
             <div>
+              <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="handAlarm">
+                手动消警
+              </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量处置
               </el-button>
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index f710718..43a1f5b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -7,7 +7,11 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormRules, TabsPaneContext } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
-import { addPosition, editPosition, getPositionListPage } from '@/api/home/device/device'
+import {
+  addPosition,
+  editPosition,
+  getPositionListPage
+} from '@/api/home/device/device'
 import { getPiePleListPage } from '@/api/home/ledger/pipeline'
 import AMap from '@/components/map/index.vue'
 // import { getDictByCode } from '@/api/system/dict'
@@ -30,14 +34,28 @@
   deptid: '', // 管理单位
   pipeCode: '', // 关联管线
   locationCategory: '',
+  propertyPerson: '',
+  propertyPhone: '',
 }) // 表单
 const rules: FormRules = {
-  tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
-  longitude: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
-  latitude: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }],
-  position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
-  deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
-  pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
+  tagNumber: [
+    { required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }
+  ],
+  longitude: [
+    { required: true, message: '经度不能为空', trigger: ['blur', 'change'] }
+  ],
+  latitude: [
+    { required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }
+  ],
+  position: [
+    { required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }
+  ],
+  deptid: [
+    { required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }
+  ],
+  pipeCode: [
+    { required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }
+  ]
 } // 前端校验规则
 
 const mapRef = ref()
@@ -53,11 +71,14 @@
 // 地图加载完成
 const completeMap = () => {
   if (dataForm.value.longitude && dataForm.value.latitude) {
-    mapRef.value.map?.setCenter([dataForm.value.longitude, dataForm.value.latitude])
+    mapRef.value.map?.setCenter([
+      dataForm.value.longitude,
+      dataForm.value.latitude
+    ])
     mapRef.value.addMarker({
       position: [dataForm.value.longitude, dataForm.value.latitude],
       content: '',
-      label: '',
+      label: ''
     })
   }
   // 加载中心点marker
@@ -80,7 +101,7 @@
   mapRef.value.addMarker({
     position: location,
     content: '',
-    label: '',
+    label: ''
   })
   // 填充坐标信息
   dataForm.value.longitude = e.lnglat.getLng()
@@ -101,6 +122,8 @@
   { text: '管线编号', value: 'pipeCode', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
+      { text: '负责人', value: 'propertyPerson', align: 'center', width: '100' },
+  { text: '联系电话', value: 'propertyPhone', align: 'center', width: '120' },
 ])
 const loadingTable = ref(true)
 //  查询条件
@@ -110,18 +133,20 @@
   tagNumber: '', // 位号
   pipeCode: '', // 编号
   deptId: '', // 管理单位
-  position: '', // 详细位置
+  position: '' // 详细位置
 } as { [key: string]: string | number })
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  getPositionListPage(listQuery.value).then((res) => {
-    list.value = res.data.rows
-    total.value = res.data.total
-    loadingTable.value = false
-  }).catch(() => {
-    loadingTable.value = false
-  })
+  getPositionListPage(listQuery.value)
+    .then(res => {
+      list.value = res.data.rows
+      total.value = res.data.total
+      loadingTable.value = false
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
 }
 fetchData()
 // 重置查询条件f
@@ -132,7 +157,7 @@
     tagNumber: '', // 位号
     pipeCode: '', // 编号
     deptId: '', // 管理单位
-    position: '', // 详细位置
+    position: '' // 详细位置
   }
   fetchData()
 }
@@ -157,49 +182,58 @@
   if (row.tagNumber && row.deptid) {
     // console.log('找到绑定关系')
     loading.value = true
-    getPositionListPage({ tagNumber: row.tagNumber, deptid: row.deptid, offset: 1, limit: 1 }).then(res => {
-      if (res.data.rows.length) {
-        if (Boolean(res.data.rows[0].lngGaode && res.data.rows[0].latGaode)) {
-          const location = [res.data.rows[0].lngGaode, res.data.rows[0].latGaode]
-          mapRef.value.removeMarker()
-          mapRef.value.addMarker({
-            position: location,
-            content: '',
-            label: '',
-          })
-          dataForm.value.longitude = res.data.rows[0].lngGaode
-          dataForm.value.latitude = res.data.rows[0].latGaode
-          mapRef.value.map.setCenter(location)
-          // mapRef.value.map.setZoom(9)
-          // setTimeout(() => {
-          //   mapRef.value.map.setZoom(14)
-          // }, 500)
-        }
-        else {
+    getPositionListPage({
+      tagNumber: row.tagNumber,
+      deptid: row.deptid,
+      offset: 1,
+      limit: 1
+    })
+      .then(res => {
+        if (res.data.rows.length) {
+          if (Boolean(res.data.rows[0].lngGaode && res.data.rows[0].latGaode)) {
+            const location = [
+              res.data.rows[0].lngGaode,
+              res.data.rows[0].latGaode
+            ]
+            mapRef.value.removeMarker()
+            mapRef.value.addMarker({
+              position: location,
+              content: '',
+              label: ''
+            })
+            dataForm.value.longitude = res.data.rows[0].lngGaode
+            dataForm.value.latitude = res.data.rows[0].latGaode
+            mapRef.value.map.setCenter(location)
+            // mapRef.value.map.setZoom(9)
+            // setTimeout(() => {
+            //   mapRef.value.map.setZoom(14)
+            // }, 500)
+          } else {
+            mapRef.value.removeMarker()
+            dataForm.value.longitude = ''
+            dataForm.value.latitude = ''
+            // mapRef.value.map.setCenter([])
+            ElMessage.warning('该点位缺少坐标位置，请选择坐标位置')
+          }
+          dataForm.value.position = res.data.rows[0].position
+          dataForm.value.deptid = row.deptid
+          dataForm.value.tagNumber = row.tagNumber
+          dataForm.value.pipeCode = res.data.rows[0].pipeCode
+          dataForm.value.propertyPerson = res.data.rows[0].propertyPerson
+          dataForm.value.propertyPhone = res.data.rows[0].propertyPhone
+        } else {
           mapRef.value.removeMarker()
           dataForm.value.longitude = ''
           dataForm.value.latitude = ''
-          // mapRef.value.map.setCenter([])
+          dataForm.value.position = ''
           ElMessage.warning('该点位缺少坐标位置，请选择坐标位置')
         }
-        dataForm.value.position = res.data.rows[0].position
-        dataForm.value.deptid = row.deptid
-        dataForm.value.tagNumber = row.tagNumber
-        dataForm.value.pipeCode = res.data.rows[0].pipeCode
-      }
-      else {
-        mapRef.value.removeMarker()
-        dataForm.value.longitude = ''
-        dataForm.value.latitude = ''
-        dataForm.value.position = ''
-        ElMessage.warning('该点位缺少坐标位置，请选择坐标位置')
-      }
-      loading.value = false
-    }).catch(() => {
-      loading.value = false
-    })
-  }
-  else {
+        loading.value = false
+      })
+      .catch(() => {
+        loading.value = false
+      })
+  } else {
     loading.value = false
     // console.log('没有找到绑定关系')
     dataForm.value.longitude = ''
@@ -208,6 +242,8 @@
     dataForm.value.deptid = ''
     dataForm.value.tagNumber = ''
     dataForm.value.pipeCode = ''
+    dataForm.value.propertyPerson = ''
+    dataForm.value.propertyPhone = ''
     // 判断是否同意获取当前位置
     const setInfo = (longitude: string | number, latitude: string | number) => {
       mapRef.value.map.setCenter([longitude, latitude])
@@ -224,44 +260,49 @@
       mapRef.value.addMarker({
         position: [longitude, latitude],
         content: '',
-        label: '',
+        label: ''
       })
     }
     setTimeout(() => {
-      mapRef.value.getLocation((position: any) => {
-        // console.log(position, 'positon')
-        // console.log(position.position.lng, 'positon.positon.lng')
-        setTimeout(() => {
-          setInfo(position.position.lng, position.position.lat)
-        })
-      }, () => {
-        if (!sessionStorage.getItem('longitude')) {
-          getLocation()
+      mapRef.value.getLocation(
+        (position: any) => {
+          // console.log(position, 'positon')
+          // console.log(position.position.lng, 'positon.positon.lng')
           setTimeout(() => {
-            if (sessionStorage.getItem('longitude')) {
-              setInfo(sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string)
-            }
-            else {
-              mapRef.value.map.setCenter(['116.397428', '39.90923'])
-              // mapRef.value.map.setZoom(9)
-              // setTimeout(() => {
-              //   mapRef.value.map.setZoom(14)
-              // }, 500)
-            }
+            setInfo(position.position.lng, position.position.lat)
           })
+        },
+        () => {
+          if (!sessionStorage.getItem('longitude')) {
+            getLocation()
+            setTimeout(() => {
+              if (sessionStorage.getItem('longitude')) {
+                setInfo(
+                  sessionStorage.getItem('longitude') as string,
+                  sessionStorage.getItem('latitude') as string
+                )
+              } else {
+                mapRef.value.map.setCenter(['116.397428', '39.90923'])
+                // mapRef.value.map.setZoom(9)
+                // setTimeout(() => {
+                //   mapRef.value.map.setZoom(14)
+                // }, 500)
+              }
+            })
+          } else {
+            setInfo(
+              sessionStorage.getItem('longitude') as string,
+              sessionStorage.getItem('latitude') as string
+            )
+          }
         }
-        else {
-          setInfo(sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string)
-        }
-      })
+      )
     })
-
   }
-
 }
 const dialogRef = ref()
 defineExpose({
-  initDialog,
+  initDialog
 })
 // 保存数据
 const deptRef = ref()
@@ -273,100 +314,117 @@
         // 先查询是否含有该位号
         getPositionListPage({
           tagNumber: dataForm.value.tagNumber,
-          deptid: dataForm.value.deptid,
-          offset: 1, limit: 1
-        }).then(res => {
-          disabledBtn.value = false
-          if (res.data.rows.length) {
-            //  已经含有
-            ElMessageBox.confirm(
-              '该点位已经存在，确认编辑该点位信息?',
-              '提示',
-              {
-                confirmButtonText: '确认',
-                cancelButtonText: '取消',
-                type: 'warning',
-              }
-            ).then(() => {
+          // deptid: dataForm.value.deptid,
+          offset: 1,
+          limit: 1
+        })
+          .then(res => {
+            disabledBtn.value = false
+            if (res.data.rows.length) {
+              //  已经含有
+              ElMessageBox.confirm(
+                '该点位已经存在，确认编辑该点位信息?',
+                '提示',
+                {
+                  confirmButtonText: '确认',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+                }
+              ).then(() => {
+                loading.value = true
+                const data = res.data.rows[0]
+                const result = {
+                  deptName: data.deptName,
+                  latGaode: data.latGaode,
+                  lngGaode: data.lngGaode,
+                  // pipeCode: data.pipeCode,
+                  // deptid: data.deptid,
+                  // position: data.position,
+                  // tagNumber: data.tagNumber,
+                  // longitude: data.lngGaode, // 经度
+                  // latitude: data.latGaode, // 纬度
+                  id: data.id,
+                  ...dataForm.value
+                }
+                disabledBtn.value = true
+                editPosition({
+                  deptid: dataForm.value.deptid,
+                  latGaode: dataForm.value.latitude,
+                  lngGaode: dataForm.value.longitude,
+                  pipeCode: dataForm.value.pipeCode,
+                  position: dataForm.value.position,
+                  tagNumber: dataForm.value.tagNumber,
+                  id: data.id,
+                  type: '3',
+                  locationCategory: dataForm.value.locationCategory,
+                  propertyPerson: dataForm.value.propertyPerson,
+                  propertyPhone: dataForm.value.propertyPhone,
+                })
+                  .then(res => {
+                    ElMessage.success('编辑点位成功')
+                    emits('confirm', result, 'single')
+                    dialogFormVisible.value = false
+                    loading.value = false
+                    disabledBtn.value = false
+                  })
+                  .catch(() => {
+                    loading.value = false
+                    disabledBtn.value = false
+                  })
+              })
+            } else {
               loading.value = true
-              const data = res.data.rows[0]
-              const result = {
-                deptName: data.deptName,
-                latGaode: data.latGaode,
-                lngGaode: data.lngGaode,
-                // pipeCode: data.pipeCode,
-                // deptid: data.deptid,
-                // position: data.position,
-                // tagNumber: data.tagNumber,
-                // longitude: data.lngGaode, // 经度
-                // latitude: data.latGaode, // 纬度
-                id: data.id,
-                ...dataForm.value,
-              }
               disabledBtn.value = true
-              editPosition({
+              addPosition({
                 deptid: dataForm.value.deptid,
                 latGaode: dataForm.value.latitude,
                 lngGaode: dataForm.value.longitude,
                 pipeCode: dataForm.value.pipeCode,
                 position: dataForm.value.position,
                 tagNumber: dataForm.value.tagNumber,
-                id: data.id,
                 type: '3',
-                locationCategory: dataForm.value.locationCategory
-              }).then(res => {
-                ElMessage.success('编辑点位成功')
-                emits('confirm', result, 'single')
-                dialogFormVisible.value = false
-                loading.value = false
-                disabledBtn.value = false
-              }).catch(() => {
-                loading.value = false
-                disabledBtn.value = false
+                locationCategory: dataForm.value.locationCategory,
+                propertyPerson: dataForm.value.propertyPerson,
+                  propertyPhone: dataForm.value.propertyPhone,
               })
-            })
-          }
-          else {
-            loading.value = true
-            disabledBtn.value = true
-            addPosition({
-              deptid: dataForm.value.deptid,
-              latGaode: dataForm.value.latitude,
-              lngGaode: dataForm.value.longitude,
-              pipeCode: dataForm.value.pipeCode,
-              position: dataForm.value.position,
-              tagNumber: dataForm.value.tagNumber,
-              type: '3',
-              locationCategory: dataForm.value.locationCategory
-            }).then((res) => {
-              if (res.code === 200) {
-                ElMessage.success('新建点位成功')
-                emits('confirm', {
-                  ...dataForm.value,
-                  deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
-                  latGaode: dataForm.value.latitude,
-                  lngGaode: dataForm.value.longitude,
-                  id: res.data,
-                }, 'single')
-                dialogFormVisible.value = false
-                // dialogRef.value.close()
-                loading.value = false
-                disabledBtn.value = false
-              }
-            }).catch(() => {
-              loading.value = false
-              disabledBtn.value = false
-            })
-          }
-        })
+                .then(res => {
+                  if (res.code === 200) {
+                    ElMessage.success('新建点位成功')
+                    emits(
+                      'confirm',
+                      {
+                        ...dataForm.value,
+                        deptName: deptRef.value.fetchDeptTree().length
+                          ? deptRef.value
+                              .fetchDeptTree()
+                              .filter(
+                                (item: any) => item.id === dataForm.value.deptid
+                              ).name
+                          : '',
+                        latGaode: dataForm.value.latitude,
+                        lngGaode: dataForm.value.longitude,
+                        id: res.data
+                      },
+                      'single'
+                    )
+                    dialogFormVisible.value = false
+                    // dialogRef.value.close()
+                    loading.value = false
+                    disabledBtn.value = false
+                  }
+                })
+                .catch(() => {
+                  loading.value = false
+                  disabledBtn.value = false
+                })
+            }
+          })
           .catch(() => {
             disabledBtn.value = false
           })
-
       }
     })
-  }
-  else {
+  } else {
     if (select.value === -1) {
       ElMessage.warning('请选择数据')
       return
@@ -385,14 +443,14 @@
 const locationTypeList = ref<{ id: string; name: string; value: string }[]>([])
 // 获取字典
 const fetchDict = () => {
-  getPiePleListPage({ offset: 1, limit: 99999 }).then((res) => {
+  getPiePleListPage({ offset: 1, limit: 99999 }).then(res => {
     pipeList.value = res.data.rows.map((item: any) => ({
       name: item.pipeCode,
       id: item.pipeCode,
-      value: item.pipeCode,
+      value: item.pipeCode
     }))
   })
-  getDictByCode('locationType').then((res) => {
+  getDictByCode('locationType').then(res => {
     locationTypeList.value = res.data
   })
 }
@@ -401,64 +459,152 @@
 // 编辑临时点位
 const editRef = ref()
 const editRow = (row: any) => {
-    // console.log(row, '111')
-    editRef.value.initDialog('edit', row)
+  // console.log(row, '111')
+  editRef.value.initDialog('edit', row)
 }
 </script>
 
 <template>
-  <el-dialog ref="dialogRef" v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
+  <el-dialog
+    ref="dialogRef"
+    v-model="dialogFormVisible"
+    title="选择安装位置"
+    append-to-body
+    width="70%"
+  >
     <addDialog ref="editRef" @refresh="fetchData" />
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane v-loading="loading" label="新建/编辑点位" name="新建点位">
-        <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
+        <el-form
+          ref="dataFormRef"
+          :rules="rules"
+          :model="dataForm"
+          label-position="right"
+          label-width="80px"
+        >
           <el-row :gutter="24">
             <el-col :span="6">
               <el-form-item label="安装位号" prop="tagNumber">
-                <el-input v-model.trim="dataForm.tagNumber" type="text" placeholder="安装位号" style="width: 100%;"
-                  clearable />
+                <el-input
+                  v-model.trim="dataForm.tagNumber"
+                  type="text"
+                  placeholder="安装位号"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="位置类别">
-                <el-select v-model="dataForm.locationCategory" placeholder="位置类别" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in locationTypeList" :key="item.id" :label="item.name" :value="item.value" />
+                <el-select
+                  v-model="dataForm.locationCategory"
+                  placeholder="位置类别"
+                  style="width: 100%"
+                  clearable
+                  filterable
+                >
+                  <el-option
+                    v-for="item in locationTypeList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.value"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="关联管线">
-                <el-select v-model="dataForm.pipeCode" placeholder="关联管线" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in pipeList" :key="item.id" :label="item.name" :value="item.value" />
+                <el-select
+                  v-model="dataForm.pipeCode"
+                  placeholder="关联管线"
+                  style="width: 100%"
+                  clearable
+                  filterable
+                >
+                  <el-option
+                    v-for="item in pipeList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.value"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="管理单位" prop="deptid">
-                <dept-select ref="deptRef" v-model="dataForm.deptid" placeholder="管理单位" :clearable="true"
-                  style="width: 100%;" />
+                <dept-select
+                  ref="deptRef"
+                  v-model="dataForm.deptid"
+                  placeholder="管理单位"
+                  :clearable="true"
+                  style="width: 100%"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="8">
               <el-form-item label="详细位置" prop="position">
-                <el-input v-model.trim="dataForm.position" type="textarea" :rows="6" placeholder="详细位置"
-                  style="width: 100%;" clearable />
+                <el-input
+                  v-model.trim="dataForm.position"
+                  type="textarea"
+                  :rows="6"
+                  placeholder="详细位置"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
               <el-form-item label="经度" prop="longitude">
-                <el-input v-model.trim="dataForm.longitude" type="text" placeholder="经度" style="width: 100%;"
-                  clearable />
+                <el-input
+                  v-model.trim="dataForm.longitude"
+                  type="text"
+                  placeholder="经度"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
               <el-form-item label="纬度" prop="latitude">
-                <el-input v-model.trim="dataForm.latitude" type="text" placeholder="纬度" style="width: 100%;"
-                  clearable />
+                <el-input
+                  v-model.trim="dataForm.latitude"
+                  type="text"
+                  placeholder="纬度"
+                  style="width: 100%"
+                  clearable
+                />
+              </el-form-item>
+              <el-form-item label="负责人" prop="propertyPerson">
+                <el-input
+                  v-model.trim="dataForm.propertyPerson"
+                  type="text"
+                  placeholder="负责人"
+                  style="width: 100%"
+                  clearable
+                />
+              </el-form-item>
+              <el-form-item label="联系电话" prop="propertyPhone">
+                <el-input
+                  v-model.trim="dataForm.propertyPhone"
+                  type="text"
+                  placeholder="联系电话"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
             </el-col>
-            <el-col :span="16" v-if="dialogFormVisible && activeName === '新建点位'">
+            <el-col
+              :span="16"
+              v-if="dialogFormVisible && activeName === '新建点位'"
+            >
               <!-- 地图 -->
-              <a-map ref="mapRef" :show-pieple-layer="true" :center="mapCenter" :zoom="14" @complete="completeMap"
-                @map-click="mapClick" style="width: 100%; height: 240px;" />
+              <a-map
+                ref="mapRef"
+                :show-pieple-layer="true"
+                :center="mapCenter"
+                :zoom="14"
+                @complete="completeMap"
+                @map-click="mapClick"
+                style="width: 100%; height: 340px"
+              />
             </el-col>
           </el-row>
         </el-form>
@@ -466,39 +612,78 @@
       <el-tab-pane label="既有位置" name="既有位置">
         <search-area :need-clear="true" @search="fetchData" @clear="reset">
           <search-item>
-            <el-input v-model.trim="listQuery.tagNumber" placeholder="安装位号" clearable style="width: 162px;" />
+            <el-input
+              v-model.trim="listQuery.tagNumber"
+              placeholder="安装位号"
+              clearable
+              style="width: 162px"
+            />
           </search-item>
           <search-item>
-            <el-input v-model.trim="listQuery.pipeCode" placeholder="管线编号" clearable style="width: 162px;" />
+            <el-input
+              v-model.trim="listQuery.pipeCode"
+              placeholder="管线编号"
+              clearable
+              style="width: 162px"
+            />
           </search-item>
           <search-item>
-            <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 162px;" />
+            <dept-select
+              v-model="listQuery.deptId"
+              placeholder="管理单位"
+              :clearable="true"
+              style="width: 162px"
+            />
           </search-item>
           <search-item>
-            <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 162px;" />
+            <el-input
+              v-model.trim="listQuery.position"
+              placeholder="详细位置"
+              clearable
+              style="width: 162px"
+            />
           </search-item>
         </search-area>
         <table-container>
           <!-- 查询结果Table显示 -->
-          <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-            @change="changePage">
+          <normal-table
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loadingTable"
+            @change="changePage"
+          >
             <template #preColumns>
               <el-table-column label="选择" width="55" align="center">
                 <template #default="scope">
-                  <el-radio v-model="select" :label="scope.$index" class="radio" />
+                  <el-radio
+                    v-model="select"
+                    :label="scope.$index"
+                    class="radio"
+                  />
                 </template>
               </el-table-column>
               <el-table-column label="序号" width="75" align="center">
                 <template #default="scope">
-                  {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+                  {{
+                    ((listQuery.offset as number) - 1) *
+                      (listQuery.limit as number) +
+                    scope.$index +
+                    1
+                  }}
                 </template>
               </el-table-column>
             </template>
             <template #columns>
-
               <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
-                  <el-button type="primary" link size="small" @click="editRow(scope.row)">
+                  <el-button
+                    type="primary"
+                    link
+                    size="small"
+                    @click="editRow(scope.row)"
+                  >
                     编辑
                   </el-button>
                 </template>
@@ -510,12 +695,15 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button :loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button
+          :loading="disabledBtn"
+          :disabled="disabledBtn"
+          type="primary"
+          @click="saveData"
+        >
           确认
         </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <el-button @click="cancel"> 取消 </el-button>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index d8a00bf..c348409 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -30,6 +30,8 @@
   deptid: '', // 管理单位
   ledgerName: '', // 闸井名称
   locationCategory: '',
+    propertyPerson: '',
+  propertyPhone: '',
 }) // 表单
 const listQueryTemporary = ref({
   tagNumber: '', // 安装位号
@@ -110,7 +112,10 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
   { text: '更新时间', value: 'ts', align: 'center' },
+    { text: '负责人', value: 'propertyPerson', align: 'center', width: '100' },
+  { text: '联系电话', value: 'propertyPhone', align: 'center', width: '120' },
   // { text: '操作人', value: 'position', align: 'center' },
+
 ])
 const loadingTable = ref(true)
 const loadingTableTemporary = ref(false)
@@ -222,7 +227,7 @@
 const tableRef = ref()
 const tableRef1 = ref()
 const initDialog = (row: any) => {
-  console.log(row, 'row')
+  // console.log(row, 'row')
   multiSelectData.value = []
   tableRef.value?.clearMulti()
   dialogFormVisible.value = true
@@ -237,6 +242,8 @@
     deptid: '', // 管理单位
     ledgerName: '', // 闸井名称
     locationCategory: '',
+      propertyPerson: '',
+  propertyPhone: '',
   }
   if (row.tagNumber && row.deptid) {
     // 找到绑定关系
@@ -279,6 +286,8 @@
               deptid: row.deptid,
               ledgerName: row.ledgerName,
               locationCategory: res.data.rows[0].locationCategory,
+              propertyPerson: res.data.rows[0].propertyPerson,
+              propertyPhone: res.data.rows[0].propertyPhone,
             }
           }
           else {
@@ -359,7 +368,7 @@
         disabledBtn.value = true
         loading.value = true
         // 先查找是否还有该点位
-        getSyncListPage({ tagNumber: dataForm.value.tagNumber, deptId: dataForm.value.deptid, limit: 1, offset: 1, type: 1 }).then((res) => {
+        getSyncListPage({ tagNumber: dataForm.value.tagNumber, limit: 1, offset: 1, type: 1 }).then((res) => {
           if (res.data.rows.length) {
             disabledBtn.value = false
             //  已经含有
@@ -399,6 +408,8 @@
                 id: data.id,
                 type: '1',
                 locationCategory: dataForm.value.locationCategory,
+                propertyPerson: dataForm.value.propertyPerson,
+                propertyPhone: dataForm.value.propertyPhone,
               }).then((res) => {
                 ElMessage.success('编辑点位成功')
                 emits('confirm', result, 'single')
@@ -426,6 +437,8 @@
               tagNumber: dataForm.value.tagNumber,
               type: '1',
               locationCategory: dataForm.value.locationCategory,
+              propertyPerson: dataForm.value.propertyPerson,
+                propertyPhone: dataForm.value.propertyPhone,
             }).then((res) => {
               ElMessage.success('新建点位成功')
 
@@ -645,11 +658,17 @@
                 <el-input v-model.trim="dataForm.latitude" type="text" placeholder="纬度" style="width: 100%;"
                   clearable />
               </el-form-item>
+              <el-form-item label="负责人" prop="propertyPerson">
+            <el-input v-model.trim="dataForm.propertyPerson" type="text" placeholder="负责人" style="width: 100%;" clearable />
+          </el-form-item>
+          <el-form-item label="联系电话" prop="propertyPhone">
+            <el-input v-model.trim="dataForm.propertyPhone" type="text" placeholder="联系电话" style="width: 100%;" clearable />
+          </el-form-item>
             </el-col>
             <el-col v-if="activeName === '新建点位'" :span="16">
               <!-- 地图 -->
               <a-map ref="mapRef" :show-pieple-layer="true" :center="mapCenter" :zoom="14"
-                style="width: 100%; height: 240px;" @complete="completeMap" @map-click="mapClick" />
+                style="width: 100%; height: 340px;" @complete="completeMap" @map-click="mapClick" />
             </el-col>
           </el-row>
         </el-form>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 8eca8b5..67cc516 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -31,7 +31,9 @@
   ledgerName: '',
   type: '3',
   id: '',
-  locationCategory: ''
+  locationCategory: '',
+  propertyPerson: '',
+  propertyPhone: '',
 }) // 表单
 const rules: FormRules = {
   tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
@@ -91,7 +93,9 @@
       ledgerName: '',
       type: '1',
       id: '',
-      locationCategory: ''
+      locationCategory: '',
+      propertyPerson: '',
+      propertyPhone: '',
     }
     dataFormRef.value?.resetFields()
   }
@@ -209,11 +213,17 @@
           <el-form-item label="纬度" prop="latGaode">
             <el-input v-model.trim="dataForm.latGaode" type="text" placeholder="纬度" style="width: 100%;" clearable />
           </el-form-item>
+          <el-form-item label="负责人" prop="propertyPerson">
+            <el-input v-model.trim="dataForm.propertyPerson" type="text" placeholder="负责人" style="width: 100%;" clearable />
+          </el-form-item>
+          <el-form-item label="联系电话" prop="propertyPhone">
+            <el-input v-model.trim="dataForm.propertyPhone" type="text" placeholder="联系电话" style="width: 100%;" clearable />
+          </el-form-item>
         </el-col>
         <el-col :span="16" v-if="dialogFormVisible">
           <!-- 地图 -->
           <a-map ref="mapRef" :show-pieple-layer="true" :center="mapCenter" :zoom="14" @complete="completeMap"
-            @map-click="mapClick" style="width: 100%; height: 240px;" />
+            @map-click="mapClick" style="width: 100%; height: 340px;" />
         </el-col>
       </el-row>
     </el-form>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index a2665b4..7177293 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -19,14 +19,15 @@
 // 表格初始列
 const columns = ref<any>([
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '位置类别', value: 'locationCategoryName', align: 'center' },
+  { text: '位置类别', value: 'locationCategoryName', align: 'center', width: '130' },
   { text: '详细位置', value: 'position', align: 'center' },
   // { text: '关联管线', value: 'pipeCode', align: 'center' },
   { text: '经度', value: 'lngGaode', align: 'center' },
   { text: '纬度', value: 'latGaode', align: 'center' },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '更新时间', value: 'ts', align: 'center' },
-  // { text: '操作人', value: 'user', align: 'center' },
+  { text: '更新时间', value: 'ts', align: 'center', width: '180' },
+  { text: '负责人', value: 'propertyPerson', align: 'center', width: '100' },
+  { text: '联系电话', value: 'propertyPhone', align: 'center', width: '120' },
 ])
 // 表格最终展示列
 const columnsConfig = ref<any>([])

diff --git a/public/config/config.json b/public/config/config.json
index 22f4711..1053b40 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://111.198.10.15:11643",
+  "baseUrl": "http://10.30.7.26:20705",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/api/home/alarm/current.ts b/src/api/home/alarm/current.ts
index cc36a2f..d1a2ed1 100644
--- a/src/api/home/alarm/current.ts
+++ b/src/api/home/alarm/current.ts
@@ -67,6 +67,16 @@
     },
   })
 }
+// 手动消警
+export function batchHandDelete(codes: any) {
+  return request({
+    url: '/system/alarmRecords/cancelAlarmByLedgerNumber',
+    method: 'post',
+    data: {
+      codes,
+    },
+  })
+}
 export function exportCurrentAlarm(data: any) {
   return request({
     url: '/system/alarmRecords/batchExport',
diff --git a/src/components.d.ts b/src/components.d.ts
index b6e680f..003b04b 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,21 +74,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
-    VanBackTop: typeof import('vant/es')['BackTop']
-    VanCell: typeof import('vant/es')['Cell']
-    VanCellGroup: typeof import('vant/es')['CellGroup']
-    VanDatePicker: typeof import('vant/es')['DatePicker']
-    VanDialog: typeof import('vant/es')['Dialog']
-    VanEmpty: typeof import('vant/es')['Empty']
-    VanField: typeof import('vant/es')['Field']
-    VanForm: typeof import('vant/es')['Form']
-    VanIcon: typeof import('vant/es')['Icon']
-    VanPicker: typeof import('vant/es')['Picker']
-    VanPickerGroup: typeof import('vant/es')['PickerGroup']
-    VanPopup: typeof import('vant/es')['Popup']
-    VanRadio: typeof import('vant/es')['Radio']
-    VanRadioGroup: typeof import('vant/es')['RadioGroup']
-    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index f0cadbc..c649738 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -186,6 +186,20 @@
         }
       }
     })
+    // 处理挂起结束
+    const pending = alarmDynamics.value.find((item: any) => item.process_name === '挂起' && item.confirmValue)
+    if(pending) {
+     const pendingIndex = alarmDynamics.value.findIndex((item: any) => item.process_name === '挂起' && item.confirmValue)
+     // 上一个状态
+     const lastStatus = alarmDynamics.value[pendingIndex - 1]
+     alarmDynamics.value.splice(pendingIndex+ 1, 1, {
+      process_name: `挂起时间到，状态改为${lastStatus?.process_name || ' '}`,
+      approvalTime: pending.confirmValue,
+      approvalPerson: '',
+      dept_name: '',
+      name: ''
+     })
+    }
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 69fae06..fab569f 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -8,7 +8,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-import { batchDelete, detailAlarm, exportCurrentAlarm, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
+import { batchDelete, batchHandDelete, detailAlarm, exportCurrentAlarm, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
 import { getStationListPage } from '@/api/home/station/station'
 import { getDictByCode } from '@/api/system/dict'
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
@@ -547,6 +547,31 @@
     })
   })
 }
+// 手动消警
+const handAlarm = () => {
+  if (!multipleTable.value.length) {
+    ElMessage.warning('请先选中数据')
+    return
+  }
+   ElMessageBox.confirm(
+    '确定要消除选中的数据吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(res => {
+    batchHandDelete(multipleTable.value.map((item: any) => item.ledgerNumber)).then(res => {
+      ElMessage.success('操作成功')
+      // 清空多选
+      multipleTable.value = []
+      tableRef.value.clearMulti()
+      fetchData()
+    })
+  })
+}
+// batchHandDelete
 // 跳转设备详情
 const toDeviceDetail = (row: any) => {
   if (!row.devcode || !row.devTypeName) {
@@ -779,6 +804,9 @@
           <template #btns-right>
             <!-- 操作 -->
             <div>
+              <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="handAlarm">
+                手动消警
+              </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量处置
               </el-button>
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index f710718..43a1f5b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -7,7 +7,11 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormRules, TabsPaneContext } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
-import { addPosition, editPosition, getPositionListPage } from '@/api/home/device/device'
+import {
+  addPosition,
+  editPosition,
+  getPositionListPage
+} from '@/api/home/device/device'
 import { getPiePleListPage } from '@/api/home/ledger/pipeline'
 import AMap from '@/components/map/index.vue'
 // import { getDictByCode } from '@/api/system/dict'
@@ -30,14 +34,28 @@
   deptid: '', // 管理单位
   pipeCode: '', // 关联管线
   locationCategory: '',
+  propertyPerson: '',
+  propertyPhone: '',
 }) // 表单
 const rules: FormRules = {
-  tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
-  longitude: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
-  latitude: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }],
-  position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
-  deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
-  pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
+  tagNumber: [
+    { required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }
+  ],
+  longitude: [
+    { required: true, message: '经度不能为空', trigger: ['blur', 'change'] }
+  ],
+  latitude: [
+    { required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }
+  ],
+  position: [
+    { required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }
+  ],
+  deptid: [
+    { required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }
+  ],
+  pipeCode: [
+    { required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }
+  ]
 } // 前端校验规则
 
 const mapRef = ref()
@@ -53,11 +71,14 @@
 // 地图加载完成
 const completeMap = () => {
   if (dataForm.value.longitude && dataForm.value.latitude) {
-    mapRef.value.map?.setCenter([dataForm.value.longitude, dataForm.value.latitude])
+    mapRef.value.map?.setCenter([
+      dataForm.value.longitude,
+      dataForm.value.latitude
+    ])
     mapRef.value.addMarker({
       position: [dataForm.value.longitude, dataForm.value.latitude],
       content: '',
-      label: '',
+      label: ''
     })
   }
   // 加载中心点marker
@@ -80,7 +101,7 @@
   mapRef.value.addMarker({
     position: location,
     content: '',
-    label: '',
+    label: ''
   })
   // 填充坐标信息
   dataForm.value.longitude = e.lnglat.getLng()
@@ -101,6 +122,8 @@
   { text: '管线编号', value: 'pipeCode', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
+      { text: '负责人', value: 'propertyPerson', align: 'center', width: '100' },
+  { text: '联系电话', value: 'propertyPhone', align: 'center', width: '120' },
 ])
 const loadingTable = ref(true)
 //  查询条件
@@ -110,18 +133,20 @@
   tagNumber: '', // 位号
   pipeCode: '', // 编号
   deptId: '', // 管理单位
-  position: '', // 详细位置
+  position: '' // 详细位置
 } as { [key: string]: string | number })
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  getPositionListPage(listQuery.value).then((res) => {
-    list.value = res.data.rows
-    total.value = res.data.total
-    loadingTable.value = false
-  }).catch(() => {
-    loadingTable.value = false
-  })
+  getPositionListPage(listQuery.value)
+    .then(res => {
+      list.value = res.data.rows
+      total.value = res.data.total
+      loadingTable.value = false
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
 }
 fetchData()
 // 重置查询条件f
@@ -132,7 +157,7 @@
     tagNumber: '', // 位号
     pipeCode: '', // 编号
     deptId: '', // 管理单位
-    position: '', // 详细位置
+    position: '' // 详细位置
   }
   fetchData()
 }
@@ -157,49 +182,58 @@
   if (row.tagNumber && row.deptid) {
     // console.log('找到绑定关系')
     loading.value = true
-    getPositionListPage({ tagNumber: row.tagNumber, deptid: row.deptid, offset: 1, limit: 1 }).then(res => {
-      if (res.data.rows.length) {
-        if (Boolean(res.data.rows[0].lngGaode && res.data.rows[0].latGaode)) {
-          const location = [res.data.rows[0].lngGaode, res.data.rows[0].latGaode]
-          mapRef.value.removeMarker()
-          mapRef.value.addMarker({
-            position: location,
-            content: '',
-            label: '',
-          })
-          dataForm.value.longitude = res.data.rows[0].lngGaode
-          dataForm.value.latitude = res.data.rows[0].latGaode
-          mapRef.value.map.setCenter(location)
-          // mapRef.value.map.setZoom(9)
-          // setTimeout(() => {
-          //   mapRef.value.map.setZoom(14)
-          // }, 500)
-        }
-        else {
+    getPositionListPage({
+      tagNumber: row.tagNumber,
+      deptid: row.deptid,
+      offset: 1,
+      limit: 1
+    })
+      .then(res => {
+        if (res.data.rows.length) {
+          if (Boolean(res.data.rows[0].lngGaode && res.data.rows[0].latGaode)) {
+            const location = [
+              res.data.rows[0].lngGaode,
+              res.data.rows[0].latGaode
+            ]
+            mapRef.value.removeMarker()
+            mapRef.value.addMarker({
+              position: location,
+              content: '',
+              label: ''
+            })
+            dataForm.value.longitude = res.data.rows[0].lngGaode
+            dataForm.value.latitude = res.data.rows[0].latGaode
+            mapRef.value.map.setCenter(location)
+            // mapRef.value.map.setZoom(9)
+            // setTimeout(() => {
+            //   mapRef.value.map.setZoom(14)
+            // }, 500)
+          } else {
+            mapRef.value.removeMarker()
+            dataForm.value.longitude = ''
+            dataForm.value.latitude = ''
+            // mapRef.value.map.setCenter([])
+            ElMessage.warning('该点位缺少坐标位置，请选择坐标位置')
+          }
+          dataForm.value.position = res.data.rows[0].position
+          dataForm.value.deptid = row.deptid
+          dataForm.value.tagNumber = row.tagNumber
+          dataForm.value.pipeCode = res.data.rows[0].pipeCode
+          dataForm.value.propertyPerson = res.data.rows[0].propertyPerson
+          dataForm.value.propertyPhone = res.data.rows[0].propertyPhone
+        } else {
           mapRef.value.removeMarker()
           dataForm.value.longitude = ''
           dataForm.value.latitude = ''
-          // mapRef.value.map.setCenter([])
+          dataForm.value.position = ''
           ElMessage.warning('该点位缺少坐标位置，请选择坐标位置')
         }
-        dataForm.value.position = res.data.rows[0].position
-        dataForm.value.deptid = row.deptid
-        dataForm.value.tagNumber = row.tagNumber
-        dataForm.value.pipeCode = res.data.rows[0].pipeCode
-      }
-      else {
-        mapRef.value.removeMarker()
-        dataForm.value.longitude = ''
-        dataForm.value.latitude = ''
-        dataForm.value.position = ''
-        ElMessage.warning('该点位缺少坐标位置，请选择坐标位置')
-      }
-      loading.value = false
-    }).catch(() => {
-      loading.value = false
-    })
-  }
-  else {
+        loading.value = false
+      })
+      .catch(() => {
+        loading.value = false
+      })
+  } else {
     loading.value = false
     // console.log('没有找到绑定关系')
     dataForm.value.longitude = ''
@@ -208,6 +242,8 @@
     dataForm.value.deptid = ''
     dataForm.value.tagNumber = ''
     dataForm.value.pipeCode = ''
+    dataForm.value.propertyPerson = ''
+    dataForm.value.propertyPhone = ''
     // 判断是否同意获取当前位置
     const setInfo = (longitude: string | number, latitude: string | number) => {
       mapRef.value.map.setCenter([longitude, latitude])
@@ -224,44 +260,49 @@
       mapRef.value.addMarker({
         position: [longitude, latitude],
         content: '',
-        label: '',
+        label: ''
       })
     }
     setTimeout(() => {
-      mapRef.value.getLocation((position: any) => {
-        // console.log(position, 'positon')
-        // console.log(position.position.lng, 'positon.positon.lng')
-        setTimeout(() => {
-          setInfo(position.position.lng, position.position.lat)
-        })
-      }, () => {
-        if (!sessionStorage.getItem('longitude')) {
-          getLocation()
+      mapRef.value.getLocation(
+        (position: any) => {
+          // console.log(position, 'positon')
+          // console.log(position.position.lng, 'positon.positon.lng')
           setTimeout(() => {
-            if (sessionStorage.getItem('longitude')) {
-              setInfo(sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string)
-            }
-            else {
-              mapRef.value.map.setCenter(['116.397428', '39.90923'])
-              // mapRef.value.map.setZoom(9)
-              // setTimeout(() => {
-              //   mapRef.value.map.setZoom(14)
-              // }, 500)
-            }
+            setInfo(position.position.lng, position.position.lat)
           })
+        },
+        () => {
+          if (!sessionStorage.getItem('longitude')) {
+            getLocation()
+            setTimeout(() => {
+              if (sessionStorage.getItem('longitude')) {
+                setInfo(
+                  sessionStorage.getItem('longitude') as string,
+                  sessionStorage.getItem('latitude') as string
+                )
+              } else {
+                mapRef.value.map.setCenter(['116.397428', '39.90923'])
+                // mapRef.value.map.setZoom(9)
+                // setTimeout(() => {
+                //   mapRef.value.map.setZoom(14)
+                // }, 500)
+              }
+            })
+          } else {
+            setInfo(
+              sessionStorage.getItem('longitude') as string,
+              sessionStorage.getItem('latitude') as string
+            )
+          }
         }
-        else {
-          setInfo(sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string)
-        }
-      })
+      )
     })
-
   }
-
 }
 const dialogRef = ref()
 defineExpose({
-  initDialog,
+  initDialog
 })
 // 保存数据
 const deptRef = ref()
@@ -273,100 +314,117 @@
         // 先查询是否含有该位号
         getPositionListPage({
           tagNumber: dataForm.value.tagNumber,
-          deptid: dataForm.value.deptid,
-          offset: 1, limit: 1
-        }).then(res => {
-          disabledBtn.value = false
-          if (res.data.rows.length) {
-            //  已经含有
-            ElMessageBox.confirm(
-              '该点位已经存在，确认编辑该点位信息?',
-              '提示',
-              {
-                confirmButtonText: '确认',
-                cancelButtonText: '取消',
-                type: 'warning',
-              }
-            ).then(() => {
+          // deptid: dataForm.value.deptid,
+          offset: 1,
+          limit: 1
+        })
+          .then(res => {
+            disabledBtn.value = false
+            if (res.data.rows.length) {
+              //  已经含有
+              ElMessageBox.confirm(
+                '该点位已经存在，确认编辑该点位信息?',
+                '提示',
+                {
+                  confirmButtonText: '确认',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+                }
+              ).then(() => {
+                loading.value = true
+                const data = res.data.rows[0]
+                const result = {
+                  deptName: data.deptName,
+                  latGaode: data.latGaode,
+                  lngGaode: data.lngGaode,
+                  // pipeCode: data.pipeCode,
+                  // deptid: data.deptid,
+                  // position: data.position,
+                  // tagNumber: data.tagNumber,
+                  // longitude: data.lngGaode, // 经度
+                  // latitude: data.latGaode, // 纬度
+                  id: data.id,
+                  ...dataForm.value
+                }
+                disabledBtn.value = true
+                editPosition({
+                  deptid: dataForm.value.deptid,
+                  latGaode: dataForm.value.latitude,
+                  lngGaode: dataForm.value.longitude,
+                  pipeCode: dataForm.value.pipeCode,
+                  position: dataForm.value.position,
+                  tagNumber: dataForm.value.tagNumber,
+                  id: data.id,
+                  type: '3',
+                  locationCategory: dataForm.value.locationCategory,
+                  propertyPerson: dataForm.value.propertyPerson,
+                  propertyPhone: dataForm.value.propertyPhone,
+                })
+                  .then(res => {
+                    ElMessage.success('编辑点位成功')
+                    emits('confirm', result, 'single')
+                    dialogFormVisible.value = false
+                    loading.value = false
+                    disabledBtn.value = false
+                  })
+                  .catch(() => {
+                    loading.value = false
+                    disabledBtn.value = false
+                  })
+              })
+            } else {
               loading.value = true
-              const data = res.data.rows[0]
-              const result = {
-                deptName: data.deptName,
-                latGaode: data.latGaode,
-                lngGaode: data.lngGaode,
-                // pipeCode: data.pipeCode,
-                // deptid: data.deptid,
-                // position: data.position,
-                // tagNumber: data.tagNumber,
-                // longitude: data.lngGaode, // 经度
-                // latitude: data.latGaode, // 纬度
-                id: data.id,
-                ...dataForm.value,
-              }
               disabledBtn.value = true
-              editPosition({
+              addPosition({
                 deptid: dataForm.value.deptid,
                 latGaode: dataForm.value.latitude,
                 lngGaode: dataForm.value.longitude,
                 pipeCode: dataForm.value.pipeCode,
                 position: dataForm.value.position,
                 tagNumber: dataForm.value.tagNumber,
-                id: data.id,
                 type: '3',
-                locationCategory: dataForm.value.locationCategory
-              }).then(res => {
-                ElMessage.success('编辑点位成功')
-                emits('confirm', result, 'single')
-                dialogFormVisible.value = false
-                loading.value = false
-                disabledBtn.value = false
-              }).catch(() => {
-                loading.value = false
-                disabledBtn.value = false
+                locationCategory: dataForm.value.locationCategory,
+                propertyPerson: dataForm.value.propertyPerson,
+                  propertyPhone: dataForm.value.propertyPhone,
               })
-            })
-          }
-          else {
-            loading.value = true
-            disabledBtn.value = true
-            addPosition({
-              deptid: dataForm.value.deptid,
-              latGaode: dataForm.value.latitude,
-              lngGaode: dataForm.value.longitude,
-              pipeCode: dataForm.value.pipeCode,
-              position: dataForm.value.position,
-              tagNumber: dataForm.value.tagNumber,
-              type: '3',
-              locationCategory: dataForm.value.locationCategory
-            }).then((res) => {
-              if (res.code === 200) {
-                ElMessage.success('新建点位成功')
-                emits('confirm', {
-                  ...dataForm.value,
-                  deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
-                  latGaode: dataForm.value.latitude,
-                  lngGaode: dataForm.value.longitude,
-                  id: res.data,
-                }, 'single')
-                dialogFormVisible.value = false
-                // dialogRef.value.close()
-                loading.value = false
-                disabledBtn.value = false
-              }
-            }).catch(() => {
-              loading.value = false
-              disabledBtn.value = false
-            })
-          }
-        })
+                .then(res => {
+                  if (res.code === 200) {
+                    ElMessage.success('新建点位成功')
+                    emits(
+                      'confirm',
+                      {
+                        ...dataForm.value,
+                        deptName: deptRef.value.fetchDeptTree().length
+                          ? deptRef.value
+                              .fetchDeptTree()
+                              .filter(
+                                (item: any) => item.id === dataForm.value.deptid
+                              ).name
+                          : '',
+                        latGaode: dataForm.value.latitude,
+                        lngGaode: dataForm.value.longitude,
+                        id: res.data
+                      },
+                      'single'
+                    )
+                    dialogFormVisible.value = false
+                    // dialogRef.value.close()
+                    loading.value = false
+                    disabledBtn.value = false
+                  }
+                })
+                .catch(() => {
+                  loading.value = false
+                  disabledBtn.value = false
+                })
+            }
+          })
           .catch(() => {
             disabledBtn.value = false
           })
-
       }
     })
-  }
-  else {
+  } else {
     if (select.value === -1) {
       ElMessage.warning('请选择数据')
       return
@@ -385,14 +443,14 @@
 const locationTypeList = ref<{ id: string; name: string; value: string }[]>([])
 // 获取字典
 const fetchDict = () => {
-  getPiePleListPage({ offset: 1, limit: 99999 }).then((res) => {
+  getPiePleListPage({ offset: 1, limit: 99999 }).then(res => {
     pipeList.value = res.data.rows.map((item: any) => ({
       name: item.pipeCode,
       id: item.pipeCode,
-      value: item.pipeCode,
+      value: item.pipeCode
     }))
   })
-  getDictByCode('locationType').then((res) => {
+  getDictByCode('locationType').then(res => {
     locationTypeList.value = res.data
   })
 }
@@ -401,64 +459,152 @@
 // 编辑临时点位
 const editRef = ref()
 const editRow = (row: any) => {
-    // console.log(row, '111')
-    editRef.value.initDialog('edit', row)
+  // console.log(row, '111')
+  editRef.value.initDialog('edit', row)
 }
 </script>
 
 <template>
-  <el-dialog ref="dialogRef" v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
+  <el-dialog
+    ref="dialogRef"
+    v-model="dialogFormVisible"
+    title="选择安装位置"
+    append-to-body
+    width="70%"
+  >
     <addDialog ref="editRef" @refresh="fetchData" />
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane v-loading="loading" label="新建/编辑点位" name="新建点位">
-        <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
+        <el-form
+          ref="dataFormRef"
+          :rules="rules"
+          :model="dataForm"
+          label-position="right"
+          label-width="80px"
+        >
           <el-row :gutter="24">
             <el-col :span="6">
               <el-form-item label="安装位号" prop="tagNumber">
-                <el-input v-model.trim="dataForm.tagNumber" type="text" placeholder="安装位号" style="width: 100%;"
-                  clearable />
+                <el-input
+                  v-model.trim="dataForm.tagNumber"
+                  type="text"
+                  placeholder="安装位号"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="位置类别">
-                <el-select v-model="dataForm.locationCategory" placeholder="位置类别" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in locationTypeList" :key="item.id" :label="item.name" :value="item.value" />
+                <el-select
+                  v-model="dataForm.locationCategory"
+                  placeholder="位置类别"
+                  style="width: 100%"
+                  clearable
+                  filterable
+                >
+                  <el-option
+                    v-for="item in locationTypeList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.value"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="关联管线">
-                <el-select v-model="dataForm.pipeCode" placeholder="关联管线" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in pipeList" :key="item.id" :label="item.name" :value="item.value" />
+                <el-select
+                  v-model="dataForm.pipeCode"
+                  placeholder="关联管线"
+                  style="width: 100%"
+                  clearable
+                  filterable
+                >
+                  <el-option
+                    v-for="item in pipeList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.value"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="管理单位" prop="deptid">
-                <dept-select ref="deptRef" v-model="dataForm.deptid" placeholder="管理单位" :clearable="true"
-                  style="width: 100%;" />
+                <dept-select
+                  ref="deptRef"
+                  v-model="dataForm.deptid"
+                  placeholder="管理单位"
+                  :clearable="true"
+                  style="width: 100%"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="8">
               <el-form-item label="详细位置" prop="position">
-                <el-input v-model.trim="dataForm.position" type="textarea" :rows="6" placeholder="详细位置"
-                  style="width: 100%;" clearable />
+                <el-input
+                  v-model.trim="dataForm.position"
+                  type="textarea"
+                  :rows="6"
+                  placeholder="详细位置"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
               <el-form-item label="经度" prop="longitude">
-                <el-input v-model.trim="dataForm.longitude" type="text" placeholder="经度" style="width: 100%;"
-                  clearable />
+                <el-input
+                  v-model.trim="dataForm.longitude"
+                  type="text"
+                  placeholder="经度"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
               <el-form-item label="纬度" prop="latitude">
-                <el-input v-model.trim="dataForm.latitude" type="text" placeholder="纬度" style="width: 100%;"
-                  clearable />
+                <el-input
+                  v-model.trim="dataForm.latitude"
+                  type="text"
+                  placeholder="纬度"
+                  style="width: 100%"
+                  clearable
+                />
+              </el-form-item>
+              <el-form-item label="负责人" prop="propertyPerson">
+                <el-input
+                  v-model.trim="dataForm.propertyPerson"
+                  type="text"
+                  placeholder="负责人"
+                  style="width: 100%"
+                  clearable
+                />
+              </el-form-item>
+              <el-form-item label="联系电话" prop="propertyPhone">
+                <el-input
+                  v-model.trim="dataForm.propertyPhone"
+                  type="text"
+                  placeholder="联系电话"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
             </el-col>
-            <el-col :span="16" v-if="dialogFormVisible && activeName === '新建点位'">
+            <el-col
+              :span="16"
+              v-if="dialogFormVisible && activeName === '新建点位'"
+            >
               <!-- 地图 -->
-              <a-map ref="mapRef" :show-pieple-layer="true" :center="mapCenter" :zoom="14" @complete="completeMap"
-                @map-click="mapClick" style="width: 100%; height: 240px;" />
+              <a-map
+                ref="mapRef"
+                :show-pieple-layer="true"
+                :center="mapCenter"
+                :zoom="14"
+                @complete="completeMap"
+                @map-click="mapClick"
+                style="width: 100%; height: 340px"
+              />
             </el-col>
           </el-row>
         </el-form>
@@ -466,39 +612,78 @@
       <el-tab-pane label="既有位置" name="既有位置">
         <search-area :need-clear="true" @search="fetchData" @clear="reset">
           <search-item>
-            <el-input v-model.trim="listQuery.tagNumber" placeholder="安装位号" clearable style="width: 162px;" />
+            <el-input
+              v-model.trim="listQuery.tagNumber"
+              placeholder="安装位号"
+              clearable
+              style="width: 162px"
+            />
           </search-item>
           <search-item>
-            <el-input v-model.trim="listQuery.pipeCode" placeholder="管线编号" clearable style="width: 162px;" />
+            <el-input
+              v-model.trim="listQuery.pipeCode"
+              placeholder="管线编号"
+              clearable
+              style="width: 162px"
+            />
           </search-item>
           <search-item>
-            <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 162px;" />
+            <dept-select
+              v-model="listQuery.deptId"
+              placeholder="管理单位"
+              :clearable="true"
+              style="width: 162px"
+            />
           </search-item>
           <search-item>
-            <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 162px;" />
+            <el-input
+              v-model.trim="listQuery.position"
+              placeholder="详细位置"
+              clearable
+              style="width: 162px"
+            />
           </search-item>
         </search-area>
         <table-container>
           <!-- 查询结果Table显示 -->
-          <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-            @change="changePage">
+          <normal-table
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loadingTable"
+            @change="changePage"
+          >
             <template #preColumns>
               <el-table-column label="选择" width="55" align="center">
                 <template #default="scope">
-                  <el-radio v-model="select" :label="scope.$index" class="radio" />
+                  <el-radio
+                    v-model="select"
+                    :label="scope.$index"
+                    class="radio"
+                  />
                 </template>
               </el-table-column>
               <el-table-column label="序号" width="75" align="center">
                 <template #default="scope">
-                  {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+                  {{
+                    ((listQuery.offset as number) - 1) *
+                      (listQuery.limit as number) +
+                    scope.$index +
+                    1
+                  }}
                 </template>
               </el-table-column>
             </template>
             <template #columns>
-
               <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
-                  <el-button type="primary" link size="small" @click="editRow(scope.row)">
+                  <el-button
+                    type="primary"
+                    link
+                    size="small"
+                    @click="editRow(scope.row)"
+                  >
                     编辑
                   </el-button>
                 </template>
@@ -510,12 +695,15 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button :loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button
+          :loading="disabledBtn"
+          :disabled="disabledBtn"
+          type="primary"
+          @click="saveData"
+        >
           确认
         </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <el-button @click="cancel"> 取消 </el-button>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index d8a00bf..c348409 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -30,6 +30,8 @@
   deptid: '', // 管理单位
   ledgerName: '', // 闸井名称
   locationCategory: '',
+    propertyPerson: '',
+  propertyPhone: '',
 }) // 表单
 const listQueryTemporary = ref({
   tagNumber: '', // 安装位号
@@ -110,7 +112,10 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
   { text: '更新时间', value: 'ts', align: 'center' },
+    { text: '负责人', value: 'propertyPerson', align: 'center', width: '100' },
+  { text: '联系电话', value: 'propertyPhone', align: 'center', width: '120' },
   // { text: '操作人', value: 'position', align: 'center' },
+
 ])
 const loadingTable = ref(true)
 const loadingTableTemporary = ref(false)
@@ -222,7 +227,7 @@
 const tableRef = ref()
 const tableRef1 = ref()
 const initDialog = (row: any) => {
-  console.log(row, 'row')
+  // console.log(row, 'row')
   multiSelectData.value = []
   tableRef.value?.clearMulti()
   dialogFormVisible.value = true
@@ -237,6 +242,8 @@
     deptid: '', // 管理单位
     ledgerName: '', // 闸井名称
     locationCategory: '',
+      propertyPerson: '',
+  propertyPhone: '',
   }
   if (row.tagNumber && row.deptid) {
     // 找到绑定关系
@@ -279,6 +286,8 @@
               deptid: row.deptid,
               ledgerName: row.ledgerName,
               locationCategory: res.data.rows[0].locationCategory,
+              propertyPerson: res.data.rows[0].propertyPerson,
+              propertyPhone: res.data.rows[0].propertyPhone,
             }
           }
           else {
@@ -359,7 +368,7 @@
         disabledBtn.value = true
         loading.value = true
         // 先查找是否还有该点位
-        getSyncListPage({ tagNumber: dataForm.value.tagNumber, deptId: dataForm.value.deptid, limit: 1, offset: 1, type: 1 }).then((res) => {
+        getSyncListPage({ tagNumber: dataForm.value.tagNumber, limit: 1, offset: 1, type: 1 }).then((res) => {
           if (res.data.rows.length) {
             disabledBtn.value = false
             //  已经含有
@@ -399,6 +408,8 @@
                 id: data.id,
                 type: '1',
                 locationCategory: dataForm.value.locationCategory,
+                propertyPerson: dataForm.value.propertyPerson,
+                propertyPhone: dataForm.value.propertyPhone,
               }).then((res) => {
                 ElMessage.success('编辑点位成功')
                 emits('confirm', result, 'single')
@@ -426,6 +437,8 @@
               tagNumber: dataForm.value.tagNumber,
               type: '1',
               locationCategory: dataForm.value.locationCategory,
+              propertyPerson: dataForm.value.propertyPerson,
+                propertyPhone: dataForm.value.propertyPhone,
             }).then((res) => {
               ElMessage.success('新建点位成功')
 
@@ -645,11 +658,17 @@
                 <el-input v-model.trim="dataForm.latitude" type="text" placeholder="纬度" style="width: 100%;"
                   clearable />
               </el-form-item>
+              <el-form-item label="负责人" prop="propertyPerson">
+            <el-input v-model.trim="dataForm.propertyPerson" type="text" placeholder="负责人" style="width: 100%;" clearable />
+          </el-form-item>
+          <el-form-item label="联系电话" prop="propertyPhone">
+            <el-input v-model.trim="dataForm.propertyPhone" type="text" placeholder="联系电话" style="width: 100%;" clearable />
+          </el-form-item>
             </el-col>
             <el-col v-if="activeName === '新建点位'" :span="16">
               <!-- 地图 -->
               <a-map ref="mapRef" :show-pieple-layer="true" :center="mapCenter" :zoom="14"
-                style="width: 100%; height: 240px;" @complete="completeMap" @map-click="mapClick" />
+                style="width: 100%; height: 340px;" @complete="completeMap" @map-click="mapClick" />
             </el-col>
           </el-row>
         </el-form>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 8eca8b5..67cc516 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -31,7 +31,9 @@
   ledgerName: '',
   type: '3',
   id: '',
-  locationCategory: ''
+  locationCategory: '',
+  propertyPerson: '',
+  propertyPhone: '',
 }) // 表单
 const rules: FormRules = {
   tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
@@ -91,7 +93,9 @@
       ledgerName: '',
       type: '1',
       id: '',
-      locationCategory: ''
+      locationCategory: '',
+      propertyPerson: '',
+      propertyPhone: '',
     }
     dataFormRef.value?.resetFields()
   }
@@ -209,11 +213,17 @@
           <el-form-item label="纬度" prop="latGaode">
             <el-input v-model.trim="dataForm.latGaode" type="text" placeholder="纬度" style="width: 100%;" clearable />
           </el-form-item>
+          <el-form-item label="负责人" prop="propertyPerson">
+            <el-input v-model.trim="dataForm.propertyPerson" type="text" placeholder="负责人" style="width: 100%;" clearable />
+          </el-form-item>
+          <el-form-item label="联系电话" prop="propertyPhone">
+            <el-input v-model.trim="dataForm.propertyPhone" type="text" placeholder="联系电话" style="width: 100%;" clearable />
+          </el-form-item>
         </el-col>
         <el-col :span="16" v-if="dialogFormVisible">
           <!-- 地图 -->
           <a-map ref="mapRef" :show-pieple-layer="true" :center="mapCenter" :zoom="14" @complete="completeMap"
-            @map-click="mapClick" style="width: 100%; height: 240px;" />
+            @map-click="mapClick" style="width: 100%; height: 340px;" />
         </el-col>
       </el-row>
     </el-form>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index a2665b4..7177293 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -19,14 +19,15 @@
 // 表格初始列
 const columns = ref<any>([
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '位置类别', value: 'locationCategoryName', align: 'center' },
+  { text: '位置类别', value: 'locationCategoryName', align: 'center', width: '130' },
   { text: '详细位置', value: 'position', align: 'center' },
   // { text: '关联管线', value: 'pipeCode', align: 'center' },
   { text: '经度', value: 'lngGaode', align: 'center' },
   { text: '纬度', value: 'latGaode', align: 'center' },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '更新时间', value: 'ts', align: 'center' },
-  // { text: '操作人', value: 'user', align: 'center' },
+  { text: '更新时间', value: 'ts', align: 'center', width: '180' },
+  { text: '负责人', value: 'propertyPerson', align: 'center', width: '100' },
+  { text: '联系电话', value: 'propertyPhone', align: 'center', width: '120' },
 ])
 // 表格最终展示列
 const columnsConfig = ref<any>([])
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 75491ff..d209e2c 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -161,6 +161,20 @@
         }
       }
     })
+    // 处理挂起结束
+    const pending = alarmDynamics.value.find((item: any) => item.process_name === '挂起' && item.confirmValue)
+    if(pending) {
+     const pendingIndex = alarmDynamics.value.findIndex((item: any) => item.process_name === '挂起' && item.confirmValue)
+     // 上一个状态
+     const lastStatus = alarmDynamics.value[pendingIndex - 1]
+     alarmDynamics.value.splice(pendingIndex+ 1, 1, {
+      process_name: `挂起时间到，状态改为${lastStatus?.process_name || ' '}`,
+      approvalTime: pending.confirmValue,
+      approvalPerson: '',
+      dept_name: '',
+      name: ''
+     })
+    }
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false

diff --git a/public/config/config.json b/public/config/config.json
index 22f4711..1053b40 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://111.198.10.15:11643",
+  "baseUrl": "http://10.30.7.26:20705",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/api/home/alarm/current.ts b/src/api/home/alarm/current.ts
index cc36a2f..d1a2ed1 100644
--- a/src/api/home/alarm/current.ts
+++ b/src/api/home/alarm/current.ts
@@ -67,6 +67,16 @@
     },
   })
 }
+// 手动消警
+export function batchHandDelete(codes: any) {
+  return request({
+    url: '/system/alarmRecords/cancelAlarmByLedgerNumber',
+    method: 'post',
+    data: {
+      codes,
+    },
+  })
+}
 export function exportCurrentAlarm(data: any) {
   return request({
     url: '/system/alarmRecords/batchExport',
diff --git a/src/components.d.ts b/src/components.d.ts
index b6e680f..003b04b 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,21 +74,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
-    VanBackTop: typeof import('vant/es')['BackTop']
-    VanCell: typeof import('vant/es')['Cell']
-    VanCellGroup: typeof import('vant/es')['CellGroup']
-    VanDatePicker: typeof import('vant/es')['DatePicker']
-    VanDialog: typeof import('vant/es')['Dialog']
-    VanEmpty: typeof import('vant/es')['Empty']
-    VanField: typeof import('vant/es')['Field']
-    VanForm: typeof import('vant/es')['Form']
-    VanIcon: typeof import('vant/es')['Icon']
-    VanPicker: typeof import('vant/es')['Picker']
-    VanPickerGroup: typeof import('vant/es')['PickerGroup']
-    VanPopup: typeof import('vant/es')['Popup']
-    VanRadio: typeof import('vant/es')['Radio']
-    VanRadioGroup: typeof import('vant/es')['RadioGroup']
-    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index f0cadbc..c649738 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -186,6 +186,20 @@
         }
       }
     })
+    // 处理挂起结束
+    const pending = alarmDynamics.value.find((item: any) => item.process_name === '挂起' && item.confirmValue)
+    if(pending) {
+     const pendingIndex = alarmDynamics.value.findIndex((item: any) => item.process_name === '挂起' && item.confirmValue)
+     // 上一个状态
+     const lastStatus = alarmDynamics.value[pendingIndex - 1]
+     alarmDynamics.value.splice(pendingIndex+ 1, 1, {
+      process_name: `挂起时间到，状态改为${lastStatus?.process_name || ' '}`,
+      approvalTime: pending.confirmValue,
+      approvalPerson: '',
+      dept_name: '',
+      name: ''
+     })
+    }
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 69fae06..fab569f 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -8,7 +8,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-import { batchDelete, detailAlarm, exportCurrentAlarm, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
+import { batchDelete, batchHandDelete, detailAlarm, exportCurrentAlarm, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
 import { getStationListPage } from '@/api/home/station/station'
 import { getDictByCode } from '@/api/system/dict'
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
@@ -547,6 +547,31 @@
     })
   })
 }
+// 手动消警
+const handAlarm = () => {
+  if (!multipleTable.value.length) {
+    ElMessage.warning('请先选中数据')
+    return
+  }
+   ElMessageBox.confirm(
+    '确定要消除选中的数据吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(res => {
+    batchHandDelete(multipleTable.value.map((item: any) => item.ledgerNumber)).then(res => {
+      ElMessage.success('操作成功')
+      // 清空多选
+      multipleTable.value = []
+      tableRef.value.clearMulti()
+      fetchData()
+    })
+  })
+}
+// batchHandDelete
 // 跳转设备详情
 const toDeviceDetail = (row: any) => {
   if (!row.devcode || !row.devTypeName) {
@@ -779,6 +804,9 @@
           <template #btns-right>
             <!-- 操作 -->
             <div>
+              <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="handAlarm">
+                手动消警
+              </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量处置
               </el-button>
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index f710718..43a1f5b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -7,7 +7,11 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormRules, TabsPaneContext } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
-import { addPosition, editPosition, getPositionListPage } from '@/api/home/device/device'
+import {
+  addPosition,
+  editPosition,
+  getPositionListPage
+} from '@/api/home/device/device'
 import { getPiePleListPage } from '@/api/home/ledger/pipeline'
 import AMap from '@/components/map/index.vue'
 // import { getDictByCode } from '@/api/system/dict'
@@ -30,14 +34,28 @@
   deptid: '', // 管理单位
   pipeCode: '', // 关联管线
   locationCategory: '',
+  propertyPerson: '',
+  propertyPhone: '',
 }) // 表单
 const rules: FormRules = {
-  tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
-  longitude: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
-  latitude: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }],
-  position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
-  deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
-  pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
+  tagNumber: [
+    { required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }
+  ],
+  longitude: [
+    { required: true, message: '经度不能为空', trigger: ['blur', 'change'] }
+  ],
+  latitude: [
+    { required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }
+  ],
+  position: [
+    { required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }
+  ],
+  deptid: [
+    { required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }
+  ],
+  pipeCode: [
+    { required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }
+  ]
 } // 前端校验规则
 
 const mapRef = ref()
@@ -53,11 +71,14 @@
 // 地图加载完成
 const completeMap = () => {
   if (dataForm.value.longitude && dataForm.value.latitude) {
-    mapRef.value.map?.setCenter([dataForm.value.longitude, dataForm.value.latitude])
+    mapRef.value.map?.setCenter([
+      dataForm.value.longitude,
+      dataForm.value.latitude
+    ])
     mapRef.value.addMarker({
       position: [dataForm.value.longitude, dataForm.value.latitude],
       content: '',
-      label: '',
+      label: ''
     })
   }
   // 加载中心点marker
@@ -80,7 +101,7 @@
   mapRef.value.addMarker({
     position: location,
     content: '',
-    label: '',
+    label: ''
   })
   // 填充坐标信息
   dataForm.value.longitude = e.lnglat.getLng()
@@ -101,6 +122,8 @@
   { text: '管线编号', value: 'pipeCode', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
+      { text: '负责人', value: 'propertyPerson', align: 'center', width: '100' },
+  { text: '联系电话', value: 'propertyPhone', align: 'center', width: '120' },
 ])
 const loadingTable = ref(true)
 //  查询条件
@@ -110,18 +133,20 @@
   tagNumber: '', // 位号
   pipeCode: '', // 编号
   deptId: '', // 管理单位
-  position: '', // 详细位置
+  position: '' // 详细位置
 } as { [key: string]: string | number })
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  getPositionListPage(listQuery.value).then((res) => {
-    list.value = res.data.rows
-    total.value = res.data.total
-    loadingTable.value = false
-  }).catch(() => {
-    loadingTable.value = false
-  })
+  getPositionListPage(listQuery.value)
+    .then(res => {
+      list.value = res.data.rows
+      total.value = res.data.total
+      loadingTable.value = false
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
 }
 fetchData()
 // 重置查询条件f
@@ -132,7 +157,7 @@
     tagNumber: '', // 位号
     pipeCode: '', // 编号
     deptId: '', // 管理单位
-    position: '', // 详细位置
+    position: '' // 详细位置
   }
   fetchData()
 }
@@ -157,49 +182,58 @@
   if (row.tagNumber && row.deptid) {
     // console.log('找到绑定关系')
     loading.value = true
-    getPositionListPage({ tagNumber: row.tagNumber, deptid: row.deptid, offset: 1, limit: 1 }).then(res => {
-      if (res.data.rows.length) {
-        if (Boolean(res.data.rows[0].lngGaode && res.data.rows[0].latGaode)) {
-          const location = [res.data.rows[0].lngGaode, res.data.rows[0].latGaode]
-          mapRef.value.removeMarker()
-          mapRef.value.addMarker({
-            position: location,
-            content: '',
-            label: '',
-          })
-          dataForm.value.longitude = res.data.rows[0].lngGaode
-          dataForm.value.latitude = res.data.rows[0].latGaode
-          mapRef.value.map.setCenter(location)
-          // mapRef.value.map.setZoom(9)
-          // setTimeout(() => {
-          //   mapRef.value.map.setZoom(14)
-          // }, 500)
-        }
-        else {
+    getPositionListPage({
+      tagNumber: row.tagNumber,
+      deptid: row.deptid,
+      offset: 1,
+      limit: 1
+    })
+      .then(res => {
+        if (res.data.rows.length) {
+          if (Boolean(res.data.rows[0].lngGaode && res.data.rows[0].latGaode)) {
+            const location = [
+              res.data.rows[0].lngGaode,
+              res.data.rows[0].latGaode
+            ]
+            mapRef.value.removeMarker()
+            mapRef.value.addMarker({
+              position: location,
+              content: '',
+              label: ''
+            })
+            dataForm.value.longitude = res.data.rows[0].lngGaode
+            dataForm.value.latitude = res.data.rows[0].latGaode
+            mapRef.value.map.setCenter(location)
+            // mapRef.value.map.setZoom(9)
+            // setTimeout(() => {
+            //   mapRef.value.map.setZoom(14)
+            // }, 500)
+          } else {
+            mapRef.value.removeMarker()
+            dataForm.value.longitude = ''
+            dataForm.value.latitude = ''
+            // mapRef.value.map.setCenter([])
+            ElMessage.warning('该点位缺少坐标位置，请选择坐标位置')
+          }
+          dataForm.value.position = res.data.rows[0].position
+          dataForm.value.deptid = row.deptid
+          dataForm.value.tagNumber = row.tagNumber
+          dataForm.value.pipeCode = res.data.rows[0].pipeCode
+          dataForm.value.propertyPerson = res.data.rows[0].propertyPerson
+          dataForm.value.propertyPhone = res.data.rows[0].propertyPhone
+        } else {
           mapRef.value.removeMarker()
           dataForm.value.longitude = ''
           dataForm.value.latitude = ''
-          // mapRef.value.map.setCenter([])
+          dataForm.value.position = ''
           ElMessage.warning('该点位缺少坐标位置，请选择坐标位置')
         }
-        dataForm.value.position = res.data.rows[0].position
-        dataForm.value.deptid = row.deptid
-        dataForm.value.tagNumber = row.tagNumber
-        dataForm.value.pipeCode = res.data.rows[0].pipeCode
-      }
-      else {
-        mapRef.value.removeMarker()
-        dataForm.value.longitude = ''
-        dataForm.value.latitude = ''
-        dataForm.value.position = ''
-        ElMessage.warning('该点位缺少坐标位置，请选择坐标位置')
-      }
-      loading.value = false
-    }).catch(() => {
-      loading.value = false
-    })
-  }
-  else {
+        loading.value = false
+      })
+      .catch(() => {
+        loading.value = false
+      })
+  } else {
     loading.value = false
     // console.log('没有找到绑定关系')
     dataForm.value.longitude = ''
@@ -208,6 +242,8 @@
     dataForm.value.deptid = ''
     dataForm.value.tagNumber = ''
     dataForm.value.pipeCode = ''
+    dataForm.value.propertyPerson = ''
+    dataForm.value.propertyPhone = ''
     // 判断是否同意获取当前位置
     const setInfo = (longitude: string | number, latitude: string | number) => {
       mapRef.value.map.setCenter([longitude, latitude])
@@ -224,44 +260,49 @@
       mapRef.value.addMarker({
         position: [longitude, latitude],
         content: '',
-        label: '',
+        label: ''
       })
     }
     setTimeout(() => {
-      mapRef.value.getLocation((position: any) => {
-        // console.log(position, 'positon')
-        // console.log(position.position.lng, 'positon.positon.lng')
-        setTimeout(() => {
-          setInfo(position.position.lng, position.position.lat)
-        })
-      }, () => {
-        if (!sessionStorage.getItem('longitude')) {
-          getLocation()
+      mapRef.value.getLocation(
+        (position: any) => {
+          // console.log(position, 'positon')
+          // console.log(position.position.lng, 'positon.positon.lng')
           setTimeout(() => {
-            if (sessionStorage.getItem('longitude')) {
-              setInfo(sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string)
-            }
-            else {
-              mapRef.value.map.setCenter(['116.397428', '39.90923'])
-              // mapRef.value.map.setZoom(9)
-              // setTimeout(() => {
-              //   mapRef.value.map.setZoom(14)
-              // }, 500)
-            }
+            setInfo(position.position.lng, position.position.lat)
           })
+        },
+        () => {
+          if (!sessionStorage.getItem('longitude')) {
+            getLocation()
+            setTimeout(() => {
+              if (sessionStorage.getItem('longitude')) {
+                setInfo(
+                  sessionStorage.getItem('longitude') as string,
+                  sessionStorage.getItem('latitude') as string
+                )
+              } else {
+                mapRef.value.map.setCenter(['116.397428', '39.90923'])
+                // mapRef.value.map.setZoom(9)
+                // setTimeout(() => {
+                //   mapRef.value.map.setZoom(14)
+                // }, 500)
+              }
+            })
+          } else {
+            setInfo(
+              sessionStorage.getItem('longitude') as string,
+              sessionStorage.getItem('latitude') as string
+            )
+          }
         }
-        else {
-          setInfo(sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string)
-        }
-      })
+      )
     })
-
   }
-
 }
 const dialogRef = ref()
 defineExpose({
-  initDialog,
+  initDialog
 })
 // 保存数据
 const deptRef = ref()
@@ -273,100 +314,117 @@
         // 先查询是否含有该位号
         getPositionListPage({
           tagNumber: dataForm.value.tagNumber,
-          deptid: dataForm.value.deptid,
-          offset: 1, limit: 1
-        }).then(res => {
-          disabledBtn.value = false
-          if (res.data.rows.length) {
-            //  已经含有
-            ElMessageBox.confirm(
-              '该点位已经存在，确认编辑该点位信息?',
-              '提示',
-              {
-                confirmButtonText: '确认',
-                cancelButtonText: '取消',
-                type: 'warning',
-              }
-            ).then(() => {
+          // deptid: dataForm.value.deptid,
+          offset: 1,
+          limit: 1
+        })
+          .then(res => {
+            disabledBtn.value = false
+            if (res.data.rows.length) {
+              //  已经含有
+              ElMessageBox.confirm(
+                '该点位已经存在，确认编辑该点位信息?',
+                '提示',
+                {
+                  confirmButtonText: '确认',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+                }
+              ).then(() => {
+                loading.value = true
+                const data = res.data.rows[0]
+                const result = {
+                  deptName: data.deptName,
+                  latGaode: data.latGaode,
+                  lngGaode: data.lngGaode,
+                  // pipeCode: data.pipeCode,
+                  // deptid: data.deptid,
+                  // position: data.position,
+                  // tagNumber: data.tagNumber,
+                  // longitude: data.lngGaode, // 经度
+                  // latitude: data.latGaode, // 纬度
+                  id: data.id,
+                  ...dataForm.value
+                }
+                disabledBtn.value = true
+                editPosition({
+                  deptid: dataForm.value.deptid,
+                  latGaode: dataForm.value.latitude,
+                  lngGaode: dataForm.value.longitude,
+                  pipeCode: dataForm.value.pipeCode,
+                  position: dataForm.value.position,
+                  tagNumber: dataForm.value.tagNumber,
+                  id: data.id,
+                  type: '3',
+                  locationCategory: dataForm.value.locationCategory,
+                  propertyPerson: dataForm.value.propertyPerson,
+                  propertyPhone: dataForm.value.propertyPhone,
+                })
+                  .then(res => {
+                    ElMessage.success('编辑点位成功')
+                    emits('confirm', result, 'single')
+                    dialogFormVisible.value = false
+                    loading.value = false
+                    disabledBtn.value = false
+                  })
+                  .catch(() => {
+                    loading.value = false
+                    disabledBtn.value = false
+                  })
+              })
+            } else {
               loading.value = true
-              const data = res.data.rows[0]
-              const result = {
-                deptName: data.deptName,
-                latGaode: data.latGaode,
-                lngGaode: data.lngGaode,
-                // pipeCode: data.pipeCode,
-                // deptid: data.deptid,
-                // position: data.position,
-                // tagNumber: data.tagNumber,
-                // longitude: data.lngGaode, // 经度
-                // latitude: data.latGaode, // 纬度
-                id: data.id,
-                ...dataForm.value,
-              }
               disabledBtn.value = true
-              editPosition({
+              addPosition({
                 deptid: dataForm.value.deptid,
                 latGaode: dataForm.value.latitude,
                 lngGaode: dataForm.value.longitude,
                 pipeCode: dataForm.value.pipeCode,
                 position: dataForm.value.position,
                 tagNumber: dataForm.value.tagNumber,
-                id: data.id,
                 type: '3',
-                locationCategory: dataForm.value.locationCategory
-              }).then(res => {
-                ElMessage.success('编辑点位成功')
-                emits('confirm', result, 'single')
-                dialogFormVisible.value = false
-                loading.value = false
-                disabledBtn.value = false
-              }).catch(() => {
-                loading.value = false
-                disabledBtn.value = false
+                locationCategory: dataForm.value.locationCategory,
+                propertyPerson: dataForm.value.propertyPerson,
+                  propertyPhone: dataForm.value.propertyPhone,
               })
-            })
-          }
-          else {
-            loading.value = true
-            disabledBtn.value = true
-            addPosition({
-              deptid: dataForm.value.deptid,
-              latGaode: dataForm.value.latitude,
-              lngGaode: dataForm.value.longitude,
-              pipeCode: dataForm.value.pipeCode,
-              position: dataForm.value.position,
-              tagNumber: dataForm.value.tagNumber,
-              type: '3',
-              locationCategory: dataForm.value.locationCategory
-            }).then((res) => {
-              if (res.code === 200) {
-                ElMessage.success('新建点位成功')
-                emits('confirm', {
-                  ...dataForm.value,
-                  deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
-                  latGaode: dataForm.value.latitude,
-                  lngGaode: dataForm.value.longitude,
-                  id: res.data,
-                }, 'single')
-                dialogFormVisible.value = false
-                // dialogRef.value.close()
-                loading.value = false
-                disabledBtn.value = false
-              }
-            }).catch(() => {
-              loading.value = false
-              disabledBtn.value = false
-            })
-          }
-        })
+                .then(res => {
+                  if (res.code === 200) {
+                    ElMessage.success('新建点位成功')
+                    emits(
+                      'confirm',
+                      {
+                        ...dataForm.value,
+                        deptName: deptRef.value.fetchDeptTree().length
+                          ? deptRef.value
+                              .fetchDeptTree()
+                              .filter(
+                                (item: any) => item.id === dataForm.value.deptid
+                              ).name
+                          : '',
+                        latGaode: dataForm.value.latitude,
+                        lngGaode: dataForm.value.longitude,
+                        id: res.data
+                      },
+                      'single'
+                    )
+                    dialogFormVisible.value = false
+                    // dialogRef.value.close()
+                    loading.value = false
+                    disabledBtn.value = false
+                  }
+                })
+                .catch(() => {
+                  loading.value = false
+                  disabledBtn.value = false
+                })
+            }
+          })
           .catch(() => {
             disabledBtn.value = false
           })
-
       }
     })
-  }
-  else {
+  } else {
     if (select.value === -1) {
       ElMessage.warning('请选择数据')
       return
@@ -385,14 +443,14 @@
 const locationTypeList = ref<{ id: string; name: string; value: string }[]>([])
 // 获取字典
 const fetchDict = () => {
-  getPiePleListPage({ offset: 1, limit: 99999 }).then((res) => {
+  getPiePleListPage({ offset: 1, limit: 99999 }).then(res => {
     pipeList.value = res.data.rows.map((item: any) => ({
       name: item.pipeCode,
       id: item.pipeCode,
-      value: item.pipeCode,
+      value: item.pipeCode
     }))
   })
-  getDictByCode('locationType').then((res) => {
+  getDictByCode('locationType').then(res => {
     locationTypeList.value = res.data
   })
 }
@@ -401,64 +459,152 @@
 // 编辑临时点位
 const editRef = ref()
 const editRow = (row: any) => {
-    // console.log(row, '111')
-    editRef.value.initDialog('edit', row)
+  // console.log(row, '111')
+  editRef.value.initDialog('edit', row)
 }
 </script>
 
 <template>
-  <el-dialog ref="dialogRef" v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
+  <el-dialog
+    ref="dialogRef"
+    v-model="dialogFormVisible"
+    title="选择安装位置"
+    append-to-body
+    width="70%"
+  >
     <addDialog ref="editRef" @refresh="fetchData" />
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane v-loading="loading" label="新建/编辑点位" name="新建点位">
-        <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
+        <el-form
+          ref="dataFormRef"
+          :rules="rules"
+          :model="dataForm"
+          label-position="right"
+          label-width="80px"
+        >
           <el-row :gutter="24">
             <el-col :span="6">
               <el-form-item label="安装位号" prop="tagNumber">
-                <el-input v-model.trim="dataForm.tagNumber" type="text" placeholder="安装位号" style="width: 100%;"
-                  clearable />
+                <el-input
+                  v-model.trim="dataForm.tagNumber"
+                  type="text"
+                  placeholder="安装位号"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="位置类别">
-                <el-select v-model="dataForm.locationCategory" placeholder="位置类别" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in locationTypeList" :key="item.id" :label="item.name" :value="item.value" />
+                <el-select
+                  v-model="dataForm.locationCategory"
+                  placeholder="位置类别"
+                  style="width: 100%"
+                  clearable
+                  filterable
+                >
+                  <el-option
+                    v-for="item in locationTypeList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.value"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="关联管线">
-                <el-select v-model="dataForm.pipeCode" placeholder="关联管线" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in pipeList" :key="item.id" :label="item.name" :value="item.value" />
+                <el-select
+                  v-model="dataForm.pipeCode"
+                  placeholder="关联管线"
+                  style="width: 100%"
+                  clearable
+                  filterable
+                >
+                  <el-option
+                    v-for="item in pipeList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.value"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="管理单位" prop="deptid">
-                <dept-select ref="deptRef" v-model="dataForm.deptid" placeholder="管理单位" :clearable="true"
-                  style="width: 100%;" />
+                <dept-select
+                  ref="deptRef"
+                  v-model="dataForm.deptid"
+                  placeholder="管理单位"
+                  :clearable="true"
+                  style="width: 100%"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="8">
               <el-form-item label="详细位置" prop="position">
-                <el-input v-model.trim="dataForm.position" type="textarea" :rows="6" placeholder="详细位置"
-                  style="width: 100%;" clearable />
+                <el-input
+                  v-model.trim="dataForm.position"
+                  type="textarea"
+                  :rows="6"
+                  placeholder="详细位置"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
               <el-form-item label="经度" prop="longitude">
-                <el-input v-model.trim="dataForm.longitude" type="text" placeholder="经度" style="width: 100%;"
-                  clearable />
+                <el-input
+                  v-model.trim="dataForm.longitude"
+                  type="text"
+                  placeholder="经度"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
               <el-form-item label="纬度" prop="latitude">
-                <el-input v-model.trim="dataForm.latitude" type="text" placeholder="纬度" style="width: 100%;"
-                  clearable />
+                <el-input
+                  v-model.trim="dataForm.latitude"
+                  type="text"
+                  placeholder="纬度"
+                  style="width: 100%"
+                  clearable
+                />
+              </el-form-item>
+              <el-form-item label="负责人" prop="propertyPerson">
+                <el-input
+                  v-model.trim="dataForm.propertyPerson"
+                  type="text"
+                  placeholder="负责人"
+                  style="width: 100%"
+                  clearable
+                />
+              </el-form-item>
+              <el-form-item label="联系电话" prop="propertyPhone">
+                <el-input
+                  v-model.trim="dataForm.propertyPhone"
+                  type="text"
+                  placeholder="联系电话"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
             </el-col>
-            <el-col :span="16" v-if="dialogFormVisible && activeName === '新建点位'">
+            <el-col
+              :span="16"
+              v-if="dialogFormVisible && activeName === '新建点位'"
+            >
               <!-- 地图 -->
-              <a-map ref="mapRef" :show-pieple-layer="true" :center="mapCenter" :zoom="14" @complete="completeMap"
-                @map-click="mapClick" style="width: 100%; height: 240px;" />
+              <a-map
+                ref="mapRef"
+                :show-pieple-layer="true"
+                :center="mapCenter"
+                :zoom="14"
+                @complete="completeMap"
+                @map-click="mapClick"
+                style="width: 100%; height: 340px"
+              />
             </el-col>
           </el-row>
         </el-form>
@@ -466,39 +612,78 @@
       <el-tab-pane label="既有位置" name="既有位置">
         <search-area :need-clear="true" @search="fetchData" @clear="reset">
           <search-item>
-            <el-input v-model.trim="listQuery.tagNumber" placeholder="安装位号" clearable style="width: 162px;" />
+            <el-input
+              v-model.trim="listQuery.tagNumber"
+              placeholder="安装位号"
+              clearable
+              style="width: 162px"
+            />
           </search-item>
           <search-item>
-            <el-input v-model.trim="listQuery.pipeCode" placeholder="管线编号" clearable style="width: 162px;" />
+            <el-input
+              v-model.trim="listQuery.pipeCode"
+              placeholder="管线编号"
+              clearable
+              style="width: 162px"
+            />
           </search-item>
           <search-item>
-            <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 162px;" />
+            <dept-select
+              v-model="listQuery.deptId"
+              placeholder="管理单位"
+              :clearable="true"
+              style="width: 162px"
+            />
           </search-item>
           <search-item>
-            <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 162px;" />
+            <el-input
+              v-model.trim="listQuery.position"
+              placeholder="详细位置"
+              clearable
+              style="width: 162px"
+            />
           </search-item>
         </search-area>
         <table-container>
           <!-- 查询结果Table显示 -->
-          <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-            @change="changePage">
+          <normal-table
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loadingTable"
+            @change="changePage"
+          >
             <template #preColumns>
               <el-table-column label="选择" width="55" align="center">
                 <template #default="scope">
-                  <el-radio v-model="select" :label="scope.$index" class="radio" />
+                  <el-radio
+                    v-model="select"
+                    :label="scope.$index"
+                    class="radio"
+                  />
                 </template>
               </el-table-column>
               <el-table-column label="序号" width="75" align="center">
                 <template #default="scope">
-                  {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+                  {{
+                    ((listQuery.offset as number) - 1) *
+                      (listQuery.limit as number) +
+                    scope.$index +
+                    1
+                  }}
                 </template>
               </el-table-column>
             </template>
             <template #columns>
-
               <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
-                  <el-button type="primary" link size="small" @click="editRow(scope.row)">
+                  <el-button
+                    type="primary"
+                    link
+                    size="small"
+                    @click="editRow(scope.row)"
+                  >
                     编辑
                   </el-button>
                 </template>
@@ -510,12 +695,15 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button :loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button
+          :loading="disabledBtn"
+          :disabled="disabledBtn"
+          type="primary"
+          @click="saveData"
+        >
           确认
         </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <el-button @click="cancel"> 取消 </el-button>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index d8a00bf..c348409 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -30,6 +30,8 @@
   deptid: '', // 管理单位
   ledgerName: '', // 闸井名称
   locationCategory: '',
+    propertyPerson: '',
+  propertyPhone: '',
 }) // 表单
 const listQueryTemporary = ref({
   tagNumber: '', // 安装位号
@@ -110,7 +112,10 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
   { text: '更新时间', value: 'ts', align: 'center' },
+    { text: '负责人', value: 'propertyPerson', align: 'center', width: '100' },
+  { text: '联系电话', value: 'propertyPhone', align: 'center', width: '120' },
   // { text: '操作人', value: 'position', align: 'center' },
+
 ])
 const loadingTable = ref(true)
 const loadingTableTemporary = ref(false)
@@ -222,7 +227,7 @@
 const tableRef = ref()
 const tableRef1 = ref()
 const initDialog = (row: any) => {
-  console.log(row, 'row')
+  // console.log(row, 'row')
   multiSelectData.value = []
   tableRef.value?.clearMulti()
   dialogFormVisible.value = true
@@ -237,6 +242,8 @@
     deptid: '', // 管理单位
     ledgerName: '', // 闸井名称
     locationCategory: '',
+      propertyPerson: '',
+  propertyPhone: '',
   }
   if (row.tagNumber && row.deptid) {
     // 找到绑定关系
@@ -279,6 +286,8 @@
               deptid: row.deptid,
               ledgerName: row.ledgerName,
               locationCategory: res.data.rows[0].locationCategory,
+              propertyPerson: res.data.rows[0].propertyPerson,
+              propertyPhone: res.data.rows[0].propertyPhone,
             }
           }
           else {
@@ -359,7 +368,7 @@
         disabledBtn.value = true
         loading.value = true
         // 先查找是否还有该点位
-        getSyncListPage({ tagNumber: dataForm.value.tagNumber, deptId: dataForm.value.deptid, limit: 1, offset: 1, type: 1 }).then((res) => {
+        getSyncListPage({ tagNumber: dataForm.value.tagNumber, limit: 1, offset: 1, type: 1 }).then((res) => {
           if (res.data.rows.length) {
             disabledBtn.value = false
             //  已经含有
@@ -399,6 +408,8 @@
                 id: data.id,
                 type: '1',
                 locationCategory: dataForm.value.locationCategory,
+                propertyPerson: dataForm.value.propertyPerson,
+                propertyPhone: dataForm.value.propertyPhone,
               }).then((res) => {
                 ElMessage.success('编辑点位成功')
                 emits('confirm', result, 'single')
@@ -426,6 +437,8 @@
               tagNumber: dataForm.value.tagNumber,
               type: '1',
               locationCategory: dataForm.value.locationCategory,
+              propertyPerson: dataForm.value.propertyPerson,
+                propertyPhone: dataForm.value.propertyPhone,
             }).then((res) => {
               ElMessage.success('新建点位成功')
 
@@ -645,11 +658,17 @@
                 <el-input v-model.trim="dataForm.latitude" type="text" placeholder="纬度" style="width: 100%;"
                   clearable />
               </el-form-item>
+              <el-form-item label="负责人" prop="propertyPerson">
+            <el-input v-model.trim="dataForm.propertyPerson" type="text" placeholder="负责人" style="width: 100%;" clearable />
+          </el-form-item>
+          <el-form-item label="联系电话" prop="propertyPhone">
+            <el-input v-model.trim="dataForm.propertyPhone" type="text" placeholder="联系电话" style="width: 100%;" clearable />
+          </el-form-item>
             </el-col>
             <el-col v-if="activeName === '新建点位'" :span="16">
               <!-- 地图 -->
               <a-map ref="mapRef" :show-pieple-layer="true" :center="mapCenter" :zoom="14"
-                style="width: 100%; height: 240px;" @complete="completeMap" @map-click="mapClick" />
+                style="width: 100%; height: 340px;" @complete="completeMap" @map-click="mapClick" />
             </el-col>
           </el-row>
         </el-form>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 8eca8b5..67cc516 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -31,7 +31,9 @@
   ledgerName: '',
   type: '3',
   id: '',
-  locationCategory: ''
+  locationCategory: '',
+  propertyPerson: '',
+  propertyPhone: '',
 }) // 表单
 const rules: FormRules = {
   tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
@@ -91,7 +93,9 @@
       ledgerName: '',
       type: '1',
       id: '',
-      locationCategory: ''
+      locationCategory: '',
+      propertyPerson: '',
+      propertyPhone: '',
     }
     dataFormRef.value?.resetFields()
   }
@@ -209,11 +213,17 @@
           <el-form-item label="纬度" prop="latGaode">
             <el-input v-model.trim="dataForm.latGaode" type="text" placeholder="纬度" style="width: 100%;" clearable />
           </el-form-item>
+          <el-form-item label="负责人" prop="propertyPerson">
+            <el-input v-model.trim="dataForm.propertyPerson" type="text" placeholder="负责人" style="width: 100%;" clearable />
+          </el-form-item>
+          <el-form-item label="联系电话" prop="propertyPhone">
+            <el-input v-model.trim="dataForm.propertyPhone" type="text" placeholder="联系电话" style="width: 100%;" clearable />
+          </el-form-item>
         </el-col>
         <el-col :span="16" v-if="dialogFormVisible">
           <!-- 地图 -->
           <a-map ref="mapRef" :show-pieple-layer="true" :center="mapCenter" :zoom="14" @complete="completeMap"
-            @map-click="mapClick" style="width: 100%; height: 240px;" />
+            @map-click="mapClick" style="width: 100%; height: 340px;" />
         </el-col>
       </el-row>
     </el-form>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index a2665b4..7177293 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -19,14 +19,15 @@
 // 表格初始列
 const columns = ref<any>([
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '位置类别', value: 'locationCategoryName', align: 'center' },
+  { text: '位置类别', value: 'locationCategoryName', align: 'center', width: '130' },
   { text: '详细位置', value: 'position', align: 'center' },
   // { text: '关联管线', value: 'pipeCode', align: 'center' },
   { text: '经度', value: 'lngGaode', align: 'center' },
   { text: '纬度', value: 'latGaode', align: 'center' },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '更新时间', value: 'ts', align: 'center' },
-  // { text: '操作人', value: 'user', align: 'center' },
+  { text: '更新时间', value: 'ts', align: 'center', width: '180' },
+  { text: '负责人', value: 'propertyPerson', align: 'center', width: '100' },
+  { text: '联系电话', value: 'propertyPhone', align: 'center', width: '120' },
 ])
 // 表格最终展示列
 const columnsConfig = ref<any>([])
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 75491ff..d209e2c 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -161,6 +161,20 @@
         }
       }
     })
+    // 处理挂起结束
+    const pending = alarmDynamics.value.find((item: any) => item.process_name === '挂起' && item.confirmValue)
+    if(pending) {
+     const pendingIndex = alarmDynamics.value.findIndex((item: any) => item.process_name === '挂起' && item.confirmValue)
+     // 上一个状态
+     const lastStatus = alarmDynamics.value[pendingIndex - 1]
+     alarmDynamics.value.splice(pendingIndex+ 1, 1, {
+      process_name: `挂起时间到，状态改为${lastStatus?.process_name || ' '}`,
+      approvalTime: pending.confirmValue,
+      approvalPerson: '',
+      dept_name: '',
+      name: ''
+     })
+    }
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index e1b5f09..4467115 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -162,6 +162,20 @@
         }
       }
     })
+    // 处理挂起结束
+    const pending = alarmDynamics.value.find((item: any) => item.process_name === '挂起' && item.confirmValue)
+    if(pending) {
+     const pendingIndex = alarmDynamics.value.findIndex((item: any) => item.process_name === '挂起' && item.confirmValue)
+     // 上一个状态
+     const lastStatus = alarmDynamics.value[pendingIndex - 1]
+     alarmDynamics.value.splice(pendingIndex+ 1, 1, {
+      process_name: `挂起时间到，状态改为${lastStatus?.process_name || ' '}`,
+      approvalTime: pending.confirmValue,
+      approvalPerson: '',
+      dept_name: '',
+      name: ''
+     })
+    }
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false

diff --git a/public/config/config.json b/public/config/config.json
index 22f4711..1053b40 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://111.198.10.15:11643",
+  "baseUrl": "http://10.30.7.26:20705",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/api/home/alarm/current.ts b/src/api/home/alarm/current.ts
index cc36a2f..d1a2ed1 100644
--- a/src/api/home/alarm/current.ts
+++ b/src/api/home/alarm/current.ts
@@ -67,6 +67,16 @@
     },
   })
 }
+// 手动消警
+export function batchHandDelete(codes: any) {
+  return request({
+    url: '/system/alarmRecords/cancelAlarmByLedgerNumber',
+    method: 'post',
+    data: {
+      codes,
+    },
+  })
+}
 export function exportCurrentAlarm(data: any) {
   return request({
     url: '/system/alarmRecords/batchExport',
diff --git a/src/components.d.ts b/src/components.d.ts
index b6e680f..003b04b 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,21 +74,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
-    VanBackTop: typeof import('vant/es')['BackTop']
-    VanCell: typeof import('vant/es')['Cell']
-    VanCellGroup: typeof import('vant/es')['CellGroup']
-    VanDatePicker: typeof import('vant/es')['DatePicker']
-    VanDialog: typeof import('vant/es')['Dialog']
-    VanEmpty: typeof import('vant/es')['Empty']
-    VanField: typeof import('vant/es')['Field']
-    VanForm: typeof import('vant/es')['Form']
-    VanIcon: typeof import('vant/es')['Icon']
-    VanPicker: typeof import('vant/es')['Picker']
-    VanPickerGroup: typeof import('vant/es')['PickerGroup']
-    VanPopup: typeof import('vant/es')['Popup']
-    VanRadio: typeof import('vant/es')['Radio']
-    VanRadioGroup: typeof import('vant/es')['RadioGroup']
-    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index f0cadbc..c649738 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -186,6 +186,20 @@
         }
       }
     })
+    // 处理挂起结束
+    const pending = alarmDynamics.value.find((item: any) => item.process_name === '挂起' && item.confirmValue)
+    if(pending) {
+     const pendingIndex = alarmDynamics.value.findIndex((item: any) => item.process_name === '挂起' && item.confirmValue)
+     // 上一个状态
+     const lastStatus = alarmDynamics.value[pendingIndex - 1]
+     alarmDynamics.value.splice(pendingIndex+ 1, 1, {
+      process_name: `挂起时间到，状态改为${lastStatus?.process_name || ' '}`,
+      approvalTime: pending.confirmValue,
+      approvalPerson: '',
+      dept_name: '',
+      name: ''
+     })
+    }
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 69fae06..fab569f 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -8,7 +8,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-import { batchDelete, detailAlarm, exportCurrentAlarm, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
+import { batchDelete, batchHandDelete, detailAlarm, exportCurrentAlarm, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
 import { getStationListPage } from '@/api/home/station/station'
 import { getDictByCode } from '@/api/system/dict'
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
@@ -547,6 +547,31 @@
     })
   })
 }
+// 手动消警
+const handAlarm = () => {
+  if (!multipleTable.value.length) {
+    ElMessage.warning('请先选中数据')
+    return
+  }
+   ElMessageBox.confirm(
+    '确定要消除选中的数据吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(res => {
+    batchHandDelete(multipleTable.value.map((item: any) => item.ledgerNumber)).then(res => {
+      ElMessage.success('操作成功')
+      // 清空多选
+      multipleTable.value = []
+      tableRef.value.clearMulti()
+      fetchData()
+    })
+  })
+}
+// batchHandDelete
 // 跳转设备详情
 const toDeviceDetail = (row: any) => {
   if (!row.devcode || !row.devTypeName) {
@@ -779,6 +804,9 @@
           <template #btns-right>
             <!-- 操作 -->
             <div>
+              <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="handAlarm">
+                手动消警
+              </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量处置
               </el-button>
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index f710718..43a1f5b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -7,7 +7,11 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormRules, TabsPaneContext } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
-import { addPosition, editPosition, getPositionListPage } from '@/api/home/device/device'
+import {
+  addPosition,
+  editPosition,
+  getPositionListPage
+} from '@/api/home/device/device'
 import { getPiePleListPage } from '@/api/home/ledger/pipeline'
 import AMap from '@/components/map/index.vue'
 // import { getDictByCode } from '@/api/system/dict'
@@ -30,14 +34,28 @@
   deptid: '', // 管理单位
   pipeCode: '', // 关联管线
   locationCategory: '',
+  propertyPerson: '',
+  propertyPhone: '',
 }) // 表单
 const rules: FormRules = {
-  tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
-  longitude: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
-  latitude: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }],
-  position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
-  deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
-  pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
+  tagNumber: [
+    { required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }
+  ],
+  longitude: [
+    { required: true, message: '经度不能为空', trigger: ['blur', 'change'] }
+  ],
+  latitude: [
+    { required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }
+  ],
+  position: [
+    { required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }
+  ],
+  deptid: [
+    { required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }
+  ],
+  pipeCode: [
+    { required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }
+  ]
 } // 前端校验规则
 
 const mapRef = ref()
@@ -53,11 +71,14 @@
 // 地图加载完成
 const completeMap = () => {
   if (dataForm.value.longitude && dataForm.value.latitude) {
-    mapRef.value.map?.setCenter([dataForm.value.longitude, dataForm.value.latitude])
+    mapRef.value.map?.setCenter([
+      dataForm.value.longitude,
+      dataForm.value.latitude
+    ])
     mapRef.value.addMarker({
       position: [dataForm.value.longitude, dataForm.value.latitude],
       content: '',
-      label: '',
+      label: ''
     })
   }
   // 加载中心点marker
@@ -80,7 +101,7 @@
   mapRef.value.addMarker({
     position: location,
     content: '',
-    label: '',
+    label: ''
   })
   // 填充坐标信息
   dataForm.value.longitude = e.lnglat.getLng()
@@ -101,6 +122,8 @@
   { text: '管线编号', value: 'pipeCode', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
+      { text: '负责人', value: 'propertyPerson', align: 'center', width: '100' },
+  { text: '联系电话', value: 'propertyPhone', align: 'center', width: '120' },
 ])
 const loadingTable = ref(true)
 //  查询条件
@@ -110,18 +133,20 @@
   tagNumber: '', // 位号
   pipeCode: '', // 编号
   deptId: '', // 管理单位
-  position: '', // 详细位置
+  position: '' // 详细位置
 } as { [key: string]: string | number })
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  getPositionListPage(listQuery.value).then((res) => {
-    list.value = res.data.rows
-    total.value = res.data.total
-    loadingTable.value = false
-  }).catch(() => {
-    loadingTable.value = false
-  })
+  getPositionListPage(listQuery.value)
+    .then(res => {
+      list.value = res.data.rows
+      total.value = res.data.total
+      loadingTable.value = false
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
 }
 fetchData()
 // 重置查询条件f
@@ -132,7 +157,7 @@
     tagNumber: '', // 位号
     pipeCode: '', // 编号
     deptId: '', // 管理单位
-    position: '', // 详细位置
+    position: '' // 详细位置
   }
   fetchData()
 }
@@ -157,49 +182,58 @@
   if (row.tagNumber && row.deptid) {
     // console.log('找到绑定关系')
     loading.value = true
-    getPositionListPage({ tagNumber: row.tagNumber, deptid: row.deptid, offset: 1, limit: 1 }).then(res => {
-      if (res.data.rows.length) {
-        if (Boolean(res.data.rows[0].lngGaode && res.data.rows[0].latGaode)) {
-          const location = [res.data.rows[0].lngGaode, res.data.rows[0].latGaode]
-          mapRef.value.removeMarker()
-          mapRef.value.addMarker({
-            position: location,
-            content: '',
-            label: '',
-          })
-          dataForm.value.longitude = res.data.rows[0].lngGaode
-          dataForm.value.latitude = res.data.rows[0].latGaode
-          mapRef.value.map.setCenter(location)
-          // mapRef.value.map.setZoom(9)
-          // setTimeout(() => {
-          //   mapRef.value.map.setZoom(14)
-          // }, 500)
-        }
-        else {
+    getPositionListPage({
+      tagNumber: row.tagNumber,
+      deptid: row.deptid,
+      offset: 1,
+      limit: 1
+    })
+      .then(res => {
+        if (res.data.rows.length) {
+          if (Boolean(res.data.rows[0].lngGaode && res.data.rows[0].latGaode)) {
+            const location = [
+              res.data.rows[0].lngGaode,
+              res.data.rows[0].latGaode
+            ]
+            mapRef.value.removeMarker()
+            mapRef.value.addMarker({
+              position: location,
+              content: '',
+              label: ''
+            })
+            dataForm.value.longitude = res.data.rows[0].lngGaode
+            dataForm.value.latitude = res.data.rows[0].latGaode
+            mapRef.value.map.setCenter(location)
+            // mapRef.value.map.setZoom(9)
+            // setTimeout(() => {
+            //   mapRef.value.map.setZoom(14)
+            // }, 500)
+          } else {
+            mapRef.value.removeMarker()
+            dataForm.value.longitude = ''
+            dataForm.value.latitude = ''
+            // mapRef.value.map.setCenter([])
+            ElMessage.warning('该点位缺少坐标位置，请选择坐标位置')
+          }
+          dataForm.value.position = res.data.rows[0].position
+          dataForm.value.deptid = row.deptid
+          dataForm.value.tagNumber = row.tagNumber
+          dataForm.value.pipeCode = res.data.rows[0].pipeCode
+          dataForm.value.propertyPerson = res.data.rows[0].propertyPerson
+          dataForm.value.propertyPhone = res.data.rows[0].propertyPhone
+        } else {
           mapRef.value.removeMarker()
           dataForm.value.longitude = ''
           dataForm.value.latitude = ''
-          // mapRef.value.map.setCenter([])
+          dataForm.value.position = ''
           ElMessage.warning('该点位缺少坐标位置，请选择坐标位置')
         }
-        dataForm.value.position = res.data.rows[0].position
-        dataForm.value.deptid = row.deptid
-        dataForm.value.tagNumber = row.tagNumber
-        dataForm.value.pipeCode = res.data.rows[0].pipeCode
-      }
-      else {
-        mapRef.value.removeMarker()
-        dataForm.value.longitude = ''
-        dataForm.value.latitude = ''
-        dataForm.value.position = ''
-        ElMessage.warning('该点位缺少坐标位置，请选择坐标位置')
-      }
-      loading.value = false
-    }).catch(() => {
-      loading.value = false
-    })
-  }
-  else {
+        loading.value = false
+      })
+      .catch(() => {
+        loading.value = false
+      })
+  } else {
     loading.value = false
     // console.log('没有找到绑定关系')
     dataForm.value.longitude = ''
@@ -208,6 +242,8 @@
     dataForm.value.deptid = ''
     dataForm.value.tagNumber = ''
     dataForm.value.pipeCode = ''
+    dataForm.value.propertyPerson = ''
+    dataForm.value.propertyPhone = ''
     // 判断是否同意获取当前位置
     const setInfo = (longitude: string | number, latitude: string | number) => {
       mapRef.value.map.setCenter([longitude, latitude])
@@ -224,44 +260,49 @@
       mapRef.value.addMarker({
         position: [longitude, latitude],
         content: '',
-        label: '',
+        label: ''
       })
     }
     setTimeout(() => {
-      mapRef.value.getLocation((position: any) => {
-        // console.log(position, 'positon')
-        // console.log(position.position.lng, 'positon.positon.lng')
-        setTimeout(() => {
-          setInfo(position.position.lng, position.position.lat)
-        })
-      }, () => {
-        if (!sessionStorage.getItem('longitude')) {
-          getLocation()
+      mapRef.value.getLocation(
+        (position: any) => {
+          // console.log(position, 'positon')
+          // console.log(position.position.lng, 'positon.positon.lng')
           setTimeout(() => {
-            if (sessionStorage.getItem('longitude')) {
-              setInfo(sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string)
-            }
-            else {
-              mapRef.value.map.setCenter(['116.397428', '39.90923'])
-              // mapRef.value.map.setZoom(9)
-              // setTimeout(() => {
-              //   mapRef.value.map.setZoom(14)
-              // }, 500)
-            }
+            setInfo(position.position.lng, position.position.lat)
           })
+        },
+        () => {
+          if (!sessionStorage.getItem('longitude')) {
+            getLocation()
+            setTimeout(() => {
+              if (sessionStorage.getItem('longitude')) {
+                setInfo(
+                  sessionStorage.getItem('longitude') as string,
+                  sessionStorage.getItem('latitude') as string
+                )
+              } else {
+                mapRef.value.map.setCenter(['116.397428', '39.90923'])
+                // mapRef.value.map.setZoom(9)
+                // setTimeout(() => {
+                //   mapRef.value.map.setZoom(14)
+                // }, 500)
+              }
+            })
+          } else {
+            setInfo(
+              sessionStorage.getItem('longitude') as string,
+              sessionStorage.getItem('latitude') as string
+            )
+          }
         }
-        else {
-          setInfo(sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string)
-        }
-      })
+      )
     })
-
   }
-
 }
 const dialogRef = ref()
 defineExpose({
-  initDialog,
+  initDialog
 })
 // 保存数据
 const deptRef = ref()
@@ -273,100 +314,117 @@
         // 先查询是否含有该位号
         getPositionListPage({
           tagNumber: dataForm.value.tagNumber,
-          deptid: dataForm.value.deptid,
-          offset: 1, limit: 1
-        }).then(res => {
-          disabledBtn.value = false
-          if (res.data.rows.length) {
-            //  已经含有
-            ElMessageBox.confirm(
-              '该点位已经存在，确认编辑该点位信息?',
-              '提示',
-              {
-                confirmButtonText: '确认',
-                cancelButtonText: '取消',
-                type: 'warning',
-              }
-            ).then(() => {
+          // deptid: dataForm.value.deptid,
+          offset: 1,
+          limit: 1
+        })
+          .then(res => {
+            disabledBtn.value = false
+            if (res.data.rows.length) {
+              //  已经含有
+              ElMessageBox.confirm(
+                '该点位已经存在，确认编辑该点位信息?',
+                '提示',
+                {
+                  confirmButtonText: '确认',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+                }
+              ).then(() => {
+                loading.value = true
+                const data = res.data.rows[0]
+                const result = {
+                  deptName: data.deptName,
+                  latGaode: data.latGaode,
+                  lngGaode: data.lngGaode,
+                  // pipeCode: data.pipeCode,
+                  // deptid: data.deptid,
+                  // position: data.position,
+                  // tagNumber: data.tagNumber,
+                  // longitude: data.lngGaode, // 经度
+                  // latitude: data.latGaode, // 纬度
+                  id: data.id,
+                  ...dataForm.value
+                }
+                disabledBtn.value = true
+                editPosition({
+                  deptid: dataForm.value.deptid,
+                  latGaode: dataForm.value.latitude,
+                  lngGaode: dataForm.value.longitude,
+                  pipeCode: dataForm.value.pipeCode,
+                  position: dataForm.value.position,
+                  tagNumber: dataForm.value.tagNumber,
+                  id: data.id,
+                  type: '3',
+                  locationCategory: dataForm.value.locationCategory,
+                  propertyPerson: dataForm.value.propertyPerson,
+                  propertyPhone: dataForm.value.propertyPhone,
+                })
+                  .then(res => {
+                    ElMessage.success('编辑点位成功')
+                    emits('confirm', result, 'single')
+                    dialogFormVisible.value = false
+                    loading.value = false
+                    disabledBtn.value = false
+                  })
+                  .catch(() => {
+                    loading.value = false
+                    disabledBtn.value = false
+                  })
+              })
+            } else {
               loading.value = true
-              const data = res.data.rows[0]
-              const result = {
-                deptName: data.deptName,
-                latGaode: data.latGaode,
-                lngGaode: data.lngGaode,
-                // pipeCode: data.pipeCode,
-                // deptid: data.deptid,
-                // position: data.position,
-                // tagNumber: data.tagNumber,
-                // longitude: data.lngGaode, // 经度
-                // latitude: data.latGaode, // 纬度
-                id: data.id,
-                ...dataForm.value,
-              }
               disabledBtn.value = true
-              editPosition({
+              addPosition({
                 deptid: dataForm.value.deptid,
                 latGaode: dataForm.value.latitude,
                 lngGaode: dataForm.value.longitude,
                 pipeCode: dataForm.value.pipeCode,
                 position: dataForm.value.position,
                 tagNumber: dataForm.value.tagNumber,
-                id: data.id,
                 type: '3',
-                locationCategory: dataForm.value.locationCategory
-              }).then(res => {
-                ElMessage.success('编辑点位成功')
-                emits('confirm', result, 'single')
-                dialogFormVisible.value = false
-                loading.value = false
-                disabledBtn.value = false
-              }).catch(() => {
-                loading.value = false
-                disabledBtn.value = false
+                locationCategory: dataForm.value.locationCategory,
+                propertyPerson: dataForm.value.propertyPerson,
+                  propertyPhone: dataForm.value.propertyPhone,
               })
-            })
-          }
-          else {
-            loading.value = true
-            disabledBtn.value = true
-            addPosition({
-              deptid: dataForm.value.deptid,
-              latGaode: dataForm.value.latitude,
-              lngGaode: dataForm.value.longitude,
-              pipeCode: dataForm.value.pipeCode,
-              position: dataForm.value.position,
-              tagNumber: dataForm.value.tagNumber,
-              type: '3',
-              locationCategory: dataForm.value.locationCategory
-            }).then((res) => {
-              if (res.code === 200) {
-                ElMessage.success('新建点位成功')
-                emits('confirm', {
-                  ...dataForm.value,
-                  deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
-                  latGaode: dataForm.value.latitude,
-                  lngGaode: dataForm.value.longitude,
-                  id: res.data,
-                }, 'single')
-                dialogFormVisible.value = false
-                // dialogRef.value.close()
-                loading.value = false
-                disabledBtn.value = false
-              }
-            }).catch(() => {
-              loading.value = false
-              disabledBtn.value = false
-            })
-          }
-        })
+                .then(res => {
+                  if (res.code === 200) {
+                    ElMessage.success('新建点位成功')
+                    emits(
+                      'confirm',
+                      {
+                        ...dataForm.value,
+                        deptName: deptRef.value.fetchDeptTree().length
+                          ? deptRef.value
+                              .fetchDeptTree()
+                              .filter(
+                                (item: any) => item.id === dataForm.value.deptid
+                              ).name
+                          : '',
+                        latGaode: dataForm.value.latitude,
+                        lngGaode: dataForm.value.longitude,
+                        id: res.data
+                      },
+                      'single'
+                    )
+                    dialogFormVisible.value = false
+                    // dialogRef.value.close()
+                    loading.value = false
+                    disabledBtn.value = false
+                  }
+                })
+                .catch(() => {
+                  loading.value = false
+                  disabledBtn.value = false
+                })
+            }
+          })
           .catch(() => {
             disabledBtn.value = false
           })
-
       }
     })
-  }
-  else {
+  } else {
     if (select.value === -1) {
       ElMessage.warning('请选择数据')
       return
@@ -385,14 +443,14 @@
 const locationTypeList = ref<{ id: string; name: string; value: string }[]>([])
 // 获取字典
 const fetchDict = () => {
-  getPiePleListPage({ offset: 1, limit: 99999 }).then((res) => {
+  getPiePleListPage({ offset: 1, limit: 99999 }).then(res => {
     pipeList.value = res.data.rows.map((item: any) => ({
       name: item.pipeCode,
       id: item.pipeCode,
-      value: item.pipeCode,
+      value: item.pipeCode
     }))
   })
-  getDictByCode('locationType').then((res) => {
+  getDictByCode('locationType').then(res => {
     locationTypeList.value = res.data
   })
 }
@@ -401,64 +459,152 @@
 // 编辑临时点位
 const editRef = ref()
 const editRow = (row: any) => {
-    // console.log(row, '111')
-    editRef.value.initDialog('edit', row)
+  // console.log(row, '111')
+  editRef.value.initDialog('edit', row)
 }
 </script>
 
 <template>
-  <el-dialog ref="dialogRef" v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
+  <el-dialog
+    ref="dialogRef"
+    v-model="dialogFormVisible"
+    title="选择安装位置"
+    append-to-body
+    width="70%"
+  >
     <addDialog ref="editRef" @refresh="fetchData" />
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane v-loading="loading" label="新建/编辑点位" name="新建点位">
-        <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
+        <el-form
+          ref="dataFormRef"
+          :rules="rules"
+          :model="dataForm"
+          label-position="right"
+          label-width="80px"
+        >
           <el-row :gutter="24">
             <el-col :span="6">
               <el-form-item label="安装位号" prop="tagNumber">
-                <el-input v-model.trim="dataForm.tagNumber" type="text" placeholder="安装位号" style="width: 100%;"
-                  clearable />
+                <el-input
+                  v-model.trim="dataForm.tagNumber"
+                  type="text"
+                  placeholder="安装位号"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="位置类别">
-                <el-select v-model="dataForm.locationCategory" placeholder="位置类别" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in locationTypeList" :key="item.id" :label="item.name" :value="item.value" />
+                <el-select
+                  v-model="dataForm.locationCategory"
+                  placeholder="位置类别"
+                  style="width: 100%"
+                  clearable
+                  filterable
+                >
+                  <el-option
+                    v-for="item in locationTypeList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.value"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="关联管线">
-                <el-select v-model="dataForm.pipeCode" placeholder="关联管线" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in pipeList" :key="item.id" :label="item.name" :value="item.value" />
+                <el-select
+                  v-model="dataForm.pipeCode"
+                  placeholder="关联管线"
+                  style="width: 100%"
+                  clearable
+                  filterable
+                >
+                  <el-option
+                    v-for="item in pipeList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.value"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="管理单位" prop="deptid">
-                <dept-select ref="deptRef" v-model="dataForm.deptid" placeholder="管理单位" :clearable="true"
-                  style="width: 100%;" />
+                <dept-select
+                  ref="deptRef"
+                  v-model="dataForm.deptid"
+                  placeholder="管理单位"
+                  :clearable="true"
+                  style="width: 100%"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="8">
               <el-form-item label="详细位置" prop="position">
-                <el-input v-model.trim="dataForm.position" type="textarea" :rows="6" placeholder="详细位置"
-                  style="width: 100%;" clearable />
+                <el-input
+                  v-model.trim="dataForm.position"
+                  type="textarea"
+                  :rows="6"
+                  placeholder="详细位置"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
               <el-form-item label="经度" prop="longitude">
-                <el-input v-model.trim="dataForm.longitude" type="text" placeholder="经度" style="width: 100%;"
-                  clearable />
+                <el-input
+                  v-model.trim="dataForm.longitude"
+                  type="text"
+                  placeholder="经度"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
               <el-form-item label="纬度" prop="latitude">
-                <el-input v-model.trim="dataForm.latitude" type="text" placeholder="纬度" style="width: 100%;"
-                  clearable />
+                <el-input
+                  v-model.trim="dataForm.latitude"
+                  type="text"
+                  placeholder="纬度"
+                  style="width: 100%"
+                  clearable
+                />
+              </el-form-item>
+              <el-form-item label="负责人" prop="propertyPerson">
+                <el-input
+                  v-model.trim="dataForm.propertyPerson"
+                  type="text"
+                  placeholder="负责人"
+                  style="width: 100%"
+                  clearable
+                />
+              </el-form-item>
+              <el-form-item label="联系电话" prop="propertyPhone">
+                <el-input
+                  v-model.trim="dataForm.propertyPhone"
+                  type="text"
+                  placeholder="联系电话"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
             </el-col>
-            <el-col :span="16" v-if="dialogFormVisible && activeName === '新建点位'">
+            <el-col
+              :span="16"
+              v-if="dialogFormVisible && activeName === '新建点位'"
+            >
               <!-- 地图 -->
-              <a-map ref="mapRef" :show-pieple-layer="true" :center="mapCenter" :zoom="14" @complete="completeMap"
-                @map-click="mapClick" style="width: 100%; height: 240px;" />
+              <a-map
+                ref="mapRef"
+                :show-pieple-layer="true"
+                :center="mapCenter"
+                :zoom="14"
+                @complete="completeMap"
+                @map-click="mapClick"
+                style="width: 100%; height: 340px"
+              />
             </el-col>
           </el-row>
         </el-form>
@@ -466,39 +612,78 @@
       <el-tab-pane label="既有位置" name="既有位置">
         <search-area :need-clear="true" @search="fetchData" @clear="reset">
           <search-item>
-            <el-input v-model.trim="listQuery.tagNumber" placeholder="安装位号" clearable style="width: 162px;" />
+            <el-input
+              v-model.trim="listQuery.tagNumber"
+              placeholder="安装位号"
+              clearable
+              style="width: 162px"
+            />
           </search-item>
           <search-item>
-            <el-input v-model.trim="listQuery.pipeCode" placeholder="管线编号" clearable style="width: 162px;" />
+            <el-input
+              v-model.trim="listQuery.pipeCode"
+              placeholder="管线编号"
+              clearable
+              style="width: 162px"
+            />
           </search-item>
           <search-item>
-            <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 162px;" />
+            <dept-select
+              v-model="listQuery.deptId"
+              placeholder="管理单位"
+              :clearable="true"
+              style="width: 162px"
+            />
           </search-item>
           <search-item>
-            <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 162px;" />
+            <el-input
+              v-model.trim="listQuery.position"
+              placeholder="详细位置"
+              clearable
+              style="width: 162px"
+            />
           </search-item>
         </search-area>
         <table-container>
           <!-- 查询结果Table显示 -->
-          <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-            @change="changePage">
+          <normal-table
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loadingTable"
+            @change="changePage"
+          >
             <template #preColumns>
               <el-table-column label="选择" width="55" align="center">
                 <template #default="scope">
-                  <el-radio v-model="select" :label="scope.$index" class="radio" />
+                  <el-radio
+                    v-model="select"
+                    :label="scope.$index"
+                    class="radio"
+                  />
                 </template>
               </el-table-column>
               <el-table-column label="序号" width="75" align="center">
                 <template #default="scope">
-                  {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+                  {{
+                    ((listQuery.offset as number) - 1) *
+                      (listQuery.limit as number) +
+                    scope.$index +
+                    1
+                  }}
                 </template>
               </el-table-column>
             </template>
             <template #columns>
-
               <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
-                  <el-button type="primary" link size="small" @click="editRow(scope.row)">
+                  <el-button
+                    type="primary"
+                    link
+                    size="small"
+                    @click="editRow(scope.row)"
+                  >
                     编辑
                   </el-button>
                 </template>
@@ -510,12 +695,15 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button :loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button
+          :loading="disabledBtn"
+          :disabled="disabledBtn"
+          type="primary"
+          @click="saveData"
+        >
           确认
         </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <el-button @click="cancel"> 取消 </el-button>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index d8a00bf..c348409 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -30,6 +30,8 @@
   deptid: '', // 管理单位
   ledgerName: '', // 闸井名称
   locationCategory: '',
+    propertyPerson: '',
+  propertyPhone: '',
 }) // 表单
 const listQueryTemporary = ref({
   tagNumber: '', // 安装位号
@@ -110,7 +112,10 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
   { text: '更新时间', value: 'ts', align: 'center' },
+    { text: '负责人', value: 'propertyPerson', align: 'center', width: '100' },
+  { text: '联系电话', value: 'propertyPhone', align: 'center', width: '120' },
   // { text: '操作人', value: 'position', align: 'center' },
+
 ])
 const loadingTable = ref(true)
 const loadingTableTemporary = ref(false)
@@ -222,7 +227,7 @@
 const tableRef = ref()
 const tableRef1 = ref()
 const initDialog = (row: any) => {
-  console.log(row, 'row')
+  // console.log(row, 'row')
   multiSelectData.value = []
   tableRef.value?.clearMulti()
   dialogFormVisible.value = true
@@ -237,6 +242,8 @@
     deptid: '', // 管理单位
     ledgerName: '', // 闸井名称
     locationCategory: '',
+      propertyPerson: '',
+  propertyPhone: '',
   }
   if (row.tagNumber && row.deptid) {
     // 找到绑定关系
@@ -279,6 +286,8 @@
               deptid: row.deptid,
               ledgerName: row.ledgerName,
               locationCategory: res.data.rows[0].locationCategory,
+              propertyPerson: res.data.rows[0].propertyPerson,
+              propertyPhone: res.data.rows[0].propertyPhone,
             }
           }
           else {
@@ -359,7 +368,7 @@
         disabledBtn.value = true
         loading.value = true
         // 先查找是否还有该点位
-        getSyncListPage({ tagNumber: dataForm.value.tagNumber, deptId: dataForm.value.deptid, limit: 1, offset: 1, type: 1 }).then((res) => {
+        getSyncListPage({ tagNumber: dataForm.value.tagNumber, limit: 1, offset: 1, type: 1 }).then((res) => {
           if (res.data.rows.length) {
             disabledBtn.value = false
             //  已经含有
@@ -399,6 +408,8 @@
                 id: data.id,
                 type: '1',
                 locationCategory: dataForm.value.locationCategory,
+                propertyPerson: dataForm.value.propertyPerson,
+                propertyPhone: dataForm.value.propertyPhone,
               }).then((res) => {
                 ElMessage.success('编辑点位成功')
                 emits('confirm', result, 'single')
@@ -426,6 +437,8 @@
               tagNumber: dataForm.value.tagNumber,
               type: '1',
               locationCategory: dataForm.value.locationCategory,
+              propertyPerson: dataForm.value.propertyPerson,
+                propertyPhone: dataForm.value.propertyPhone,
             }).then((res) => {
               ElMessage.success('新建点位成功')
 
@@ -645,11 +658,17 @@
                 <el-input v-model.trim="dataForm.latitude" type="text" placeholder="纬度" style="width: 100%;"
                   clearable />
               </el-form-item>
+              <el-form-item label="负责人" prop="propertyPerson">
+            <el-input v-model.trim="dataForm.propertyPerson" type="text" placeholder="负责人" style="width: 100%;" clearable />
+          </el-form-item>
+          <el-form-item label="联系电话" prop="propertyPhone">
+            <el-input v-model.trim="dataForm.propertyPhone" type="text" placeholder="联系电话" style="width: 100%;" clearable />
+          </el-form-item>
             </el-col>
             <el-col v-if="activeName === '新建点位'" :span="16">
               <!-- 地图 -->
               <a-map ref="mapRef" :show-pieple-layer="true" :center="mapCenter" :zoom="14"
-                style="width: 100%; height: 240px;" @complete="completeMap" @map-click="mapClick" />
+                style="width: 100%; height: 340px;" @complete="completeMap" @map-click="mapClick" />
             </el-col>
           </el-row>
         </el-form>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 8eca8b5..67cc516 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -31,7 +31,9 @@
   ledgerName: '',
   type: '3',
   id: '',
-  locationCategory: ''
+  locationCategory: '',
+  propertyPerson: '',
+  propertyPhone: '',
 }) // 表单
 const rules: FormRules = {
   tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
@@ -91,7 +93,9 @@
       ledgerName: '',
       type: '1',
       id: '',
-      locationCategory: ''
+      locationCategory: '',
+      propertyPerson: '',
+      propertyPhone: '',
     }
     dataFormRef.value?.resetFields()
   }
@@ -209,11 +213,17 @@
           <el-form-item label="纬度" prop="latGaode">
             <el-input v-model.trim="dataForm.latGaode" type="text" placeholder="纬度" style="width: 100%;" clearable />
           </el-form-item>
+          <el-form-item label="负责人" prop="propertyPerson">
+            <el-input v-model.trim="dataForm.propertyPerson" type="text" placeholder="负责人" style="width: 100%;" clearable />
+          </el-form-item>
+          <el-form-item label="联系电话" prop="propertyPhone">
+            <el-input v-model.trim="dataForm.propertyPhone" type="text" placeholder="联系电话" style="width: 100%;" clearable />
+          </el-form-item>
         </el-col>
         <el-col :span="16" v-if="dialogFormVisible">
           <!-- 地图 -->
           <a-map ref="mapRef" :show-pieple-layer="true" :center="mapCenter" :zoom="14" @complete="completeMap"
-            @map-click="mapClick" style="width: 100%; height: 240px;" />
+            @map-click="mapClick" style="width: 100%; height: 340px;" />
         </el-col>
       </el-row>
     </el-form>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index a2665b4..7177293 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -19,14 +19,15 @@
 // 表格初始列
 const columns = ref<any>([
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '位置类别', value: 'locationCategoryName', align: 'center' },
+  { text: '位置类别', value: 'locationCategoryName', align: 'center', width: '130' },
   { text: '详细位置', value: 'position', align: 'center' },
   // { text: '关联管线', value: 'pipeCode', align: 'center' },
   { text: '经度', value: 'lngGaode', align: 'center' },
   { text: '纬度', value: 'latGaode', align: 'center' },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '更新时间', value: 'ts', align: 'center' },
-  // { text: '操作人', value: 'user', align: 'center' },
+  { text: '更新时间', value: 'ts', align: 'center', width: '180' },
+  { text: '负责人', value: 'propertyPerson', align: 'center', width: '100' },
+  { text: '联系电话', value: 'propertyPhone', align: 'center', width: '120' },
 ])
 // 表格最终展示列
 const columnsConfig = ref<any>([])
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 75491ff..d209e2c 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -161,6 +161,20 @@
         }
       }
     })
+    // 处理挂起结束
+    const pending = alarmDynamics.value.find((item: any) => item.process_name === '挂起' && item.confirmValue)
+    if(pending) {
+     const pendingIndex = alarmDynamics.value.findIndex((item: any) => item.process_name === '挂起' && item.confirmValue)
+     // 上一个状态
+     const lastStatus = alarmDynamics.value[pendingIndex - 1]
+     alarmDynamics.value.splice(pendingIndex+ 1, 1, {
+      process_name: `挂起时间到，状态改为${lastStatus?.process_name || ' '}`,
+      approvalTime: pending.confirmValue,
+      approvalPerson: '',
+      dept_name: '',
+      name: ''
+     })
+    }
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index e1b5f09..4467115 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -162,6 +162,20 @@
         }
       }
     })
+    // 处理挂起结束
+    const pending = alarmDynamics.value.find((item: any) => item.process_name === '挂起' && item.confirmValue)
+    if(pending) {
+     const pendingIndex = alarmDynamics.value.findIndex((item: any) => item.process_name === '挂起' && item.confirmValue)
+     // 上一个状态
+     const lastStatus = alarmDynamics.value[pendingIndex - 1]
+     alarmDynamics.value.splice(pendingIndex+ 1, 1, {
+      process_name: `挂起时间到，状态改为${lastStatus?.process_name || ' '}`,
+      approvalTime: pending.confirmValue,
+      approvalPerson: '',
+      dept_name: '',
+      name: ''
+     })
+    }
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/station/station/components/detail.vue b/src/views/home/station/station/components/detail.vue
index bb769c0..2f5e1ae 100644
--- a/src/views/home/station/station/components/detail.vue
+++ b/src/views/home/station/station/components/detail.vue
@@ -73,16 +73,16 @@
   //   align: 'center',
   // },
 
-  {
-    text: '负责人',
-    value: 'personName',
-    align: 'center',
-  },
-  {
-    text: '负责人联系方式',
-    value: 'telephone',
-    align: 'center',
-  },
+  // {
+  //   text: '负责人',
+  //   value: 'personName',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '负责人联系方式',
+  //   value: 'propertyPhone',
+  //   align: 'center',
+  // },
 
   // {
   //   text: '启用日期',

diff --git a/public/config/config.json b/public/config/config.json
index 22f4711..1053b40 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://111.198.10.15:11643",
+  "baseUrl": "http://10.30.7.26:20705",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/api/home/alarm/current.ts b/src/api/home/alarm/current.ts
index cc36a2f..d1a2ed1 100644
--- a/src/api/home/alarm/current.ts
+++ b/src/api/home/alarm/current.ts
@@ -67,6 +67,16 @@
     },
   })
 }
+// 手动消警
+export function batchHandDelete(codes: any) {
+  return request({
+    url: '/system/alarmRecords/cancelAlarmByLedgerNumber',
+    method: 'post',
+    data: {
+      codes,
+    },
+  })
+}
 export function exportCurrentAlarm(data: any) {
   return request({
     url: '/system/alarmRecords/batchExport',
diff --git a/src/components.d.ts b/src/components.d.ts
index b6e680f..003b04b 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,21 +74,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
-    VanBackTop: typeof import('vant/es')['BackTop']
-    VanCell: typeof import('vant/es')['Cell']
-    VanCellGroup: typeof import('vant/es')['CellGroup']
-    VanDatePicker: typeof import('vant/es')['DatePicker']
-    VanDialog: typeof import('vant/es')['Dialog']
-    VanEmpty: typeof import('vant/es')['Empty']
-    VanField: typeof import('vant/es')['Field']
-    VanForm: typeof import('vant/es')['Form']
-    VanIcon: typeof import('vant/es')['Icon']
-    VanPicker: typeof import('vant/es')['Picker']
-    VanPickerGroup: typeof import('vant/es')['PickerGroup']
-    VanPopup: typeof import('vant/es')['Popup']
-    VanRadio: typeof import('vant/es')['Radio']
-    VanRadioGroup: typeof import('vant/es')['RadioGroup']
-    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index f0cadbc..c649738 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -186,6 +186,20 @@
         }
       }
     })
+    // 处理挂起结束
+    const pending = alarmDynamics.value.find((item: any) => item.process_name === '挂起' && item.confirmValue)
+    if(pending) {
+     const pendingIndex = alarmDynamics.value.findIndex((item: any) => item.process_name === '挂起' && item.confirmValue)
+     // 上一个状态
+     const lastStatus = alarmDynamics.value[pendingIndex - 1]
+     alarmDynamics.value.splice(pendingIndex+ 1, 1, {
+      process_name: `挂起时间到，状态改为${lastStatus?.process_name || ' '}`,
+      approvalTime: pending.confirmValue,
+      approvalPerson: '',
+      dept_name: '',
+      name: ''
+     })
+    }
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 69fae06..fab569f 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -8,7 +8,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-import { batchDelete, detailAlarm, exportCurrentAlarm, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
+import { batchDelete, batchHandDelete, detailAlarm, exportCurrentAlarm, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
 import { getStationListPage } from '@/api/home/station/station'
 import { getDictByCode } from '@/api/system/dict'
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
@@ -547,6 +547,31 @@
     })
   })
 }
+// 手动消警
+const handAlarm = () => {
+  if (!multipleTable.value.length) {
+    ElMessage.warning('请先选中数据')
+    return
+  }
+   ElMessageBox.confirm(
+    '确定要消除选中的数据吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(res => {
+    batchHandDelete(multipleTable.value.map((item: any) => item.ledgerNumber)).then(res => {
+      ElMessage.success('操作成功')
+      // 清空多选
+      multipleTable.value = []
+      tableRef.value.clearMulti()
+      fetchData()
+    })
+  })
+}
+// batchHandDelete
 // 跳转设备详情
 const toDeviceDetail = (row: any) => {
   if (!row.devcode || !row.devTypeName) {
@@ -779,6 +804,9 @@
           <template #btns-right>
             <!-- 操作 -->
             <div>
+              <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="handAlarm">
+                手动消警
+              </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量处置
               </el-button>
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index f710718..43a1f5b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -7,7 +7,11 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormRules, TabsPaneContext } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
-import { addPosition, editPosition, getPositionListPage } from '@/api/home/device/device'
+import {
+  addPosition,
+  editPosition,
+  getPositionListPage
+} from '@/api/home/device/device'
 import { getPiePleListPage } from '@/api/home/ledger/pipeline'
 import AMap from '@/components/map/index.vue'
 // import { getDictByCode } from '@/api/system/dict'
@@ -30,14 +34,28 @@
   deptid: '', // 管理单位
   pipeCode: '', // 关联管线
   locationCategory: '',
+  propertyPerson: '',
+  propertyPhone: '',
 }) // 表单
 const rules: FormRules = {
-  tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
-  longitude: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
-  latitude: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }],
-  position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
-  deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
-  pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
+  tagNumber: [
+    { required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }
+  ],
+  longitude: [
+    { required: true, message: '经度不能为空', trigger: ['blur', 'change'] }
+  ],
+  latitude: [
+    { required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }
+  ],
+  position: [
+    { required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }
+  ],
+  deptid: [
+    { required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }
+  ],
+  pipeCode: [
+    { required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }
+  ]
 } // 前端校验规则
 
 const mapRef = ref()
@@ -53,11 +71,14 @@
 // 地图加载完成
 const completeMap = () => {
   if (dataForm.value.longitude && dataForm.value.latitude) {
-    mapRef.value.map?.setCenter([dataForm.value.longitude, dataForm.value.latitude])
+    mapRef.value.map?.setCenter([
+      dataForm.value.longitude,
+      dataForm.value.latitude
+    ])
     mapRef.value.addMarker({
       position: [dataForm.value.longitude, dataForm.value.latitude],
       content: '',
-      label: '',
+      label: ''
     })
   }
   // 加载中心点marker
@@ -80,7 +101,7 @@
   mapRef.value.addMarker({
     position: location,
     content: '',
-    label: '',
+    label: ''
   })
   // 填充坐标信息
   dataForm.value.longitude = e.lnglat.getLng()
@@ -101,6 +122,8 @@
   { text: '管线编号', value: 'pipeCode', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
+      { text: '负责人', value: 'propertyPerson', align: 'center', width: '100' },
+  { text: '联系电话', value: 'propertyPhone', align: 'center', width: '120' },
 ])
 const loadingTable = ref(true)
 //  查询条件
@@ -110,18 +133,20 @@
   tagNumber: '', // 位号
   pipeCode: '', // 编号
   deptId: '', // 管理单位
-  position: '', // 详细位置
+  position: '' // 详细位置
 } as { [key: string]: string | number })
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  getPositionListPage(listQuery.value).then((res) => {
-    list.value = res.data.rows
-    total.value = res.data.total
-    loadingTable.value = false
-  }).catch(() => {
-    loadingTable.value = false
-  })
+  getPositionListPage(listQuery.value)
+    .then(res => {
+      list.value = res.data.rows
+      total.value = res.data.total
+      loadingTable.value = false
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
 }
 fetchData()
 // 重置查询条件f
@@ -132,7 +157,7 @@
     tagNumber: '', // 位号
     pipeCode: '', // 编号
     deptId: '', // 管理单位
-    position: '', // 详细位置
+    position: '' // 详细位置
   }
   fetchData()
 }
@@ -157,49 +182,58 @@
   if (row.tagNumber && row.deptid) {
     // console.log('找到绑定关系')
     loading.value = true
-    getPositionListPage({ tagNumber: row.tagNumber, deptid: row.deptid, offset: 1, limit: 1 }).then(res => {
-      if (res.data.rows.length) {
-        if (Boolean(res.data.rows[0].lngGaode && res.data.rows[0].latGaode)) {
-          const location = [res.data.rows[0].lngGaode, res.data.rows[0].latGaode]
-          mapRef.value.removeMarker()
-          mapRef.value.addMarker({
-            position: location,
-            content: '',
-            label: '',
-          })
-          dataForm.value.longitude = res.data.rows[0].lngGaode
-          dataForm.value.latitude = res.data.rows[0].latGaode
-          mapRef.value.map.setCenter(location)
-          // mapRef.value.map.setZoom(9)
-          // setTimeout(() => {
-          //   mapRef.value.map.setZoom(14)
-          // }, 500)
-        }
-        else {
+    getPositionListPage({
+      tagNumber: row.tagNumber,
+      deptid: row.deptid,
+      offset: 1,
+      limit: 1
+    })
+      .then(res => {
+        if (res.data.rows.length) {
+          if (Boolean(res.data.rows[0].lngGaode && res.data.rows[0].latGaode)) {
+            const location = [
+              res.data.rows[0].lngGaode,
+              res.data.rows[0].latGaode
+            ]
+            mapRef.value.removeMarker()
+            mapRef.value.addMarker({
+              position: location,
+              content: '',
+              label: ''
+            })
+            dataForm.value.longitude = res.data.rows[0].lngGaode
+            dataForm.value.latitude = res.data.rows[0].latGaode
+            mapRef.value.map.setCenter(location)
+            // mapRef.value.map.setZoom(9)
+            // setTimeout(() => {
+            //   mapRef.value.map.setZoom(14)
+            // }, 500)
+          } else {
+            mapRef.value.removeMarker()
+            dataForm.value.longitude = ''
+            dataForm.value.latitude = ''
+            // mapRef.value.map.setCenter([])
+            ElMessage.warning('该点位缺少坐标位置，请选择坐标位置')
+          }
+          dataForm.value.position = res.data.rows[0].position
+          dataForm.value.deptid = row.deptid
+          dataForm.value.tagNumber = row.tagNumber
+          dataForm.value.pipeCode = res.data.rows[0].pipeCode
+          dataForm.value.propertyPerson = res.data.rows[0].propertyPerson
+          dataForm.value.propertyPhone = res.data.rows[0].propertyPhone
+        } else {
           mapRef.value.removeMarker()
           dataForm.value.longitude = ''
           dataForm.value.latitude = ''
-          // mapRef.value.map.setCenter([])
+          dataForm.value.position = ''
           ElMessage.warning('该点位缺少坐标位置，请选择坐标位置')
         }
-        dataForm.value.position = res.data.rows[0].position
-        dataForm.value.deptid = row.deptid
-        dataForm.value.tagNumber = row.tagNumber
-        dataForm.value.pipeCode = res.data.rows[0].pipeCode
-      }
-      else {
-        mapRef.value.removeMarker()
-        dataForm.value.longitude = ''
-        dataForm.value.latitude = ''
-        dataForm.value.position = ''
-        ElMessage.warning('该点位缺少坐标位置，请选择坐标位置')
-      }
-      loading.value = false
-    }).catch(() => {
-      loading.value = false
-    })
-  }
-  else {
+        loading.value = false
+      })
+      .catch(() => {
+        loading.value = false
+      })
+  } else {
     loading.value = false
     // console.log('没有找到绑定关系')
     dataForm.value.longitude = ''
@@ -208,6 +242,8 @@
     dataForm.value.deptid = ''
     dataForm.value.tagNumber = ''
     dataForm.value.pipeCode = ''
+    dataForm.value.propertyPerson = ''
+    dataForm.value.propertyPhone = ''
     // 判断是否同意获取当前位置
     const setInfo = (longitude: string | number, latitude: string | number) => {
       mapRef.value.map.setCenter([longitude, latitude])
@@ -224,44 +260,49 @@
       mapRef.value.addMarker({
         position: [longitude, latitude],
         content: '',
-        label: '',
+        label: ''
       })
     }
     setTimeout(() => {
-      mapRef.value.getLocation((position: any) => {
-        // console.log(position, 'positon')
-        // console.log(position.position.lng, 'positon.positon.lng')
-        setTimeout(() => {
-          setInfo(position.position.lng, position.position.lat)
-        })
-      }, () => {
-        if (!sessionStorage.getItem('longitude')) {
-          getLocation()
+      mapRef.value.getLocation(
+        (position: any) => {
+          // console.log(position, 'positon')
+          // console.log(position.position.lng, 'positon.positon.lng')
           setTimeout(() => {
-            if (sessionStorage.getItem('longitude')) {
-              setInfo(sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string)
-            }
-            else {
-              mapRef.value.map.setCenter(['116.397428', '39.90923'])
-              // mapRef.value.map.setZoom(9)
-              // setTimeout(() => {
-              //   mapRef.value.map.setZoom(14)
-              // }, 500)
-            }
+            setInfo(position.position.lng, position.position.lat)
           })
+        },
+        () => {
+          if (!sessionStorage.getItem('longitude')) {
+            getLocation()
+            setTimeout(() => {
+              if (sessionStorage.getItem('longitude')) {
+                setInfo(
+                  sessionStorage.getItem('longitude') as string,
+                  sessionStorage.getItem('latitude') as string
+                )
+              } else {
+                mapRef.value.map.setCenter(['116.397428', '39.90923'])
+                // mapRef.value.map.setZoom(9)
+                // setTimeout(() => {
+                //   mapRef.value.map.setZoom(14)
+                // }, 500)
+              }
+            })
+          } else {
+            setInfo(
+              sessionStorage.getItem('longitude') as string,
+              sessionStorage.getItem('latitude') as string
+            )
+          }
         }
-        else {
-          setInfo(sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string)
-        }
-      })
+      )
     })
-
   }
-
 }
 const dialogRef = ref()
 defineExpose({
-  initDialog,
+  initDialog
 })
 // 保存数据
 const deptRef = ref()
@@ -273,100 +314,117 @@
         // 先查询是否含有该位号
         getPositionListPage({
           tagNumber: dataForm.value.tagNumber,
-          deptid: dataForm.value.deptid,
-          offset: 1, limit: 1
-        }).then(res => {
-          disabledBtn.value = false
-          if (res.data.rows.length) {
-            //  已经含有
-            ElMessageBox.confirm(
-              '该点位已经存在，确认编辑该点位信息?',
-              '提示',
-              {
-                confirmButtonText: '确认',
-                cancelButtonText: '取消',
-                type: 'warning',
-              }
-            ).then(() => {
+          // deptid: dataForm.value.deptid,
+          offset: 1,
+          limit: 1
+        })
+          .then(res => {
+            disabledBtn.value = false
+            if (res.data.rows.length) {
+              //  已经含有
+              ElMessageBox.confirm(
+                '该点位已经存在，确认编辑该点位信息?',
+                '提示',
+                {
+                  confirmButtonText: '确认',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+                }
+              ).then(() => {
+                loading.value = true
+                const data = res.data.rows[0]
+                const result = {
+                  deptName: data.deptName,
+                  latGaode: data.latGaode,
+                  lngGaode: data.lngGaode,
+                  // pipeCode: data.pipeCode,
+                  // deptid: data.deptid,
+                  // position: data.position,
+                  // tagNumber: data.tagNumber,
+                  // longitude: data.lngGaode, // 经度
+                  // latitude: data.latGaode, // 纬度
+                  id: data.id,
+                  ...dataForm.value
+                }
+                disabledBtn.value = true
+                editPosition({
+                  deptid: dataForm.value.deptid,
+                  latGaode: dataForm.value.latitude,
+                  lngGaode: dataForm.value.longitude,
+                  pipeCode: dataForm.value.pipeCode,
+                  position: dataForm.value.position,
+                  tagNumber: dataForm.value.tagNumber,
+                  id: data.id,
+                  type: '3',
+                  locationCategory: dataForm.value.locationCategory,
+                  propertyPerson: dataForm.value.propertyPerson,
+                  propertyPhone: dataForm.value.propertyPhone,
+                })
+                  .then(res => {
+                    ElMessage.success('编辑点位成功')
+                    emits('confirm', result, 'single')
+                    dialogFormVisible.value = false
+                    loading.value = false
+                    disabledBtn.value = false
+                  })
+                  .catch(() => {
+                    loading.value = false
+                    disabledBtn.value = false
+                  })
+              })
+            } else {
               loading.value = true
-              const data = res.data.rows[0]
-              const result = {
-                deptName: data.deptName,
-                latGaode: data.latGaode,
-                lngGaode: data.lngGaode,
-                // pipeCode: data.pipeCode,
-                // deptid: data.deptid,
-                // position: data.position,
-                // tagNumber: data.tagNumber,
-                // longitude: data.lngGaode, // 经度
-                // latitude: data.latGaode, // 纬度
-                id: data.id,
-                ...dataForm.value,
-              }
               disabledBtn.value = true
-              editPosition({
+              addPosition({
                 deptid: dataForm.value.deptid,
                 latGaode: dataForm.value.latitude,
                 lngGaode: dataForm.value.longitude,
                 pipeCode: dataForm.value.pipeCode,
                 position: dataForm.value.position,
                 tagNumber: dataForm.value.tagNumber,
-                id: data.id,
                 type: '3',
-                locationCategory: dataForm.value.locationCategory
-              }).then(res => {
-                ElMessage.success('编辑点位成功')
-                emits('confirm', result, 'single')
-                dialogFormVisible.value = false
-                loading.value = false
-                disabledBtn.value = false
-              }).catch(() => {
-                loading.value = false
-                disabledBtn.value = false
+                locationCategory: dataForm.value.locationCategory,
+                propertyPerson: dataForm.value.propertyPerson,
+                  propertyPhone: dataForm.value.propertyPhone,
               })
-            })
-          }
-          else {
-            loading.value = true
-            disabledBtn.value = true
-            addPosition({
-              deptid: dataForm.value.deptid,
-              latGaode: dataForm.value.latitude,
-              lngGaode: dataForm.value.longitude,
-              pipeCode: dataForm.value.pipeCode,
-              position: dataForm.value.position,
-              tagNumber: dataForm.value.tagNumber,
-              type: '3',
-              locationCategory: dataForm.value.locationCategory
-            }).then((res) => {
-              if (res.code === 200) {
-                ElMessage.success('新建点位成功')
-                emits('confirm', {
-                  ...dataForm.value,
-                  deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
-                  latGaode: dataForm.value.latitude,
-                  lngGaode: dataForm.value.longitude,
-                  id: res.data,
-                }, 'single')
-                dialogFormVisible.value = false
-                // dialogRef.value.close()
-                loading.value = false
-                disabledBtn.value = false
-              }
-            }).catch(() => {
-              loading.value = false
-              disabledBtn.value = false
-            })
-          }
-        })
+                .then(res => {
+                  if (res.code === 200) {
+                    ElMessage.success('新建点位成功')
+                    emits(
+                      'confirm',
+                      {
+                        ...dataForm.value,
+                        deptName: deptRef.value.fetchDeptTree().length
+                          ? deptRef.value
+                              .fetchDeptTree()
+                              .filter(
+                                (item: any) => item.id === dataForm.value.deptid
+                              ).name
+                          : '',
+                        latGaode: dataForm.value.latitude,
+                        lngGaode: dataForm.value.longitude,
+                        id: res.data
+                      },
+                      'single'
+                    )
+                    dialogFormVisible.value = false
+                    // dialogRef.value.close()
+                    loading.value = false
+                    disabledBtn.value = false
+                  }
+                })
+                .catch(() => {
+                  loading.value = false
+                  disabledBtn.value = false
+                })
+            }
+          })
           .catch(() => {
             disabledBtn.value = false
           })
-
       }
     })
-  }
-  else {
+  } else {
     if (select.value === -1) {
       ElMessage.warning('请选择数据')
       return
@@ -385,14 +443,14 @@
 const locationTypeList = ref<{ id: string; name: string; value: string }[]>([])
 // 获取字典
 const fetchDict = () => {
-  getPiePleListPage({ offset: 1, limit: 99999 }).then((res) => {
+  getPiePleListPage({ offset: 1, limit: 99999 }).then(res => {
     pipeList.value = res.data.rows.map((item: any) => ({
       name: item.pipeCode,
       id: item.pipeCode,
-      value: item.pipeCode,
+      value: item.pipeCode
     }))
   })
-  getDictByCode('locationType').then((res) => {
+  getDictByCode('locationType').then(res => {
     locationTypeList.value = res.data
   })
 }
@@ -401,64 +459,152 @@
 // 编辑临时点位
 const editRef = ref()
 const editRow = (row: any) => {
-    // console.log(row, '111')
-    editRef.value.initDialog('edit', row)
+  // console.log(row, '111')
+  editRef.value.initDialog('edit', row)
 }
 </script>
 
 <template>
-  <el-dialog ref="dialogRef" v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
+  <el-dialog
+    ref="dialogRef"
+    v-model="dialogFormVisible"
+    title="选择安装位置"
+    append-to-body
+    width="70%"
+  >
     <addDialog ref="editRef" @refresh="fetchData" />
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane v-loading="loading" label="新建/编辑点位" name="新建点位">
-        <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
+        <el-form
+          ref="dataFormRef"
+          :rules="rules"
+          :model="dataForm"
+          label-position="right"
+          label-width="80px"
+        >
           <el-row :gutter="24">
             <el-col :span="6">
               <el-form-item label="安装位号" prop="tagNumber">
-                <el-input v-model.trim="dataForm.tagNumber" type="text" placeholder="安装位号" style="width: 100%;"
-                  clearable />
+                <el-input
+                  v-model.trim="dataForm.tagNumber"
+                  type="text"
+                  placeholder="安装位号"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="位置类别">
-                <el-select v-model="dataForm.locationCategory" placeholder="位置类别" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in locationTypeList" :key="item.id" :label="item.name" :value="item.value" />
+                <el-select
+                  v-model="dataForm.locationCategory"
+                  placeholder="位置类别"
+                  style="width: 100%"
+                  clearable
+                  filterable
+                >
+                  <el-option
+                    v-for="item in locationTypeList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.value"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="关联管线">
-                <el-select v-model="dataForm.pipeCode" placeholder="关联管线" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in pipeList" :key="item.id" :label="item.name" :value="item.value" />
+                <el-select
+                  v-model="dataForm.pipeCode"
+                  placeholder="关联管线"
+                  style="width: 100%"
+                  clearable
+                  filterable
+                >
+                  <el-option
+                    v-for="item in pipeList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.value"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="管理单位" prop="deptid">
-                <dept-select ref="deptRef" v-model="dataForm.deptid" placeholder="管理单位" :clearable="true"
-                  style="width: 100%;" />
+                <dept-select
+                  ref="deptRef"
+                  v-model="dataForm.deptid"
+                  placeholder="管理单位"
+                  :clearable="true"
+                  style="width: 100%"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="8">
               <el-form-item label="详细位置" prop="position">
-                <el-input v-model.trim="dataForm.position" type="textarea" :rows="6" placeholder="详细位置"
-                  style="width: 100%;" clearable />
+                <el-input
+                  v-model.trim="dataForm.position"
+                  type="textarea"
+                  :rows="6"
+                  placeholder="详细位置"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
               <el-form-item label="经度" prop="longitude">
-                <el-input v-model.trim="dataForm.longitude" type="text" placeholder="经度" style="width: 100%;"
-                  clearable />
+                <el-input
+                  v-model.trim="dataForm.longitude"
+                  type="text"
+                  placeholder="经度"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
               <el-form-item label="纬度" prop="latitude">
-                <el-input v-model.trim="dataForm.latitude" type="text" placeholder="纬度" style="width: 100%;"
-                  clearable />
+                <el-input
+                  v-model.trim="dataForm.latitude"
+                  type="text"
+                  placeholder="纬度"
+                  style="width: 100%"
+                  clearable
+                />
+              </el-form-item>
+              <el-form-item label="负责人" prop="propertyPerson">
+                <el-input
+                  v-model.trim="dataForm.propertyPerson"
+                  type="text"
+                  placeholder="负责人"
+                  style="width: 100%"
+                  clearable
+                />
+              </el-form-item>
+              <el-form-item label="联系电话" prop="propertyPhone">
+                <el-input
+                  v-model.trim="dataForm.propertyPhone"
+                  type="text"
+                  placeholder="联系电话"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
             </el-col>
-            <el-col :span="16" v-if="dialogFormVisible && activeName === '新建点位'">
+            <el-col
+              :span="16"
+              v-if="dialogFormVisible && activeName === '新建点位'"
+            >
               <!-- 地图 -->
-              <a-map ref="mapRef" :show-pieple-layer="true" :center="mapCenter" :zoom="14" @complete="completeMap"
-                @map-click="mapClick" style="width: 100%; height: 240px;" />
+              <a-map
+                ref="mapRef"
+                :show-pieple-layer="true"
+                :center="mapCenter"
+                :zoom="14"
+                @complete="completeMap"
+                @map-click="mapClick"
+                style="width: 100%; height: 340px"
+              />
             </el-col>
           </el-row>
         </el-form>
@@ -466,39 +612,78 @@
       <el-tab-pane label="既有位置" name="既有位置">
         <search-area :need-clear="true" @search="fetchData" @clear="reset">
           <search-item>
-            <el-input v-model.trim="listQuery.tagNumber" placeholder="安装位号" clearable style="width: 162px;" />
+            <el-input
+              v-model.trim="listQuery.tagNumber"
+              placeholder="安装位号"
+              clearable
+              style="width: 162px"
+            />
           </search-item>
           <search-item>
-            <el-input v-model.trim="listQuery.pipeCode" placeholder="管线编号" clearable style="width: 162px;" />
+            <el-input
+              v-model.trim="listQuery.pipeCode"
+              placeholder="管线编号"
+              clearable
+              style="width: 162px"
+            />
           </search-item>
           <search-item>
-            <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 162px;" />
+            <dept-select
+              v-model="listQuery.deptId"
+              placeholder="管理单位"
+              :clearable="true"
+              style="width: 162px"
+            />
           </search-item>
           <search-item>
-            <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 162px;" />
+            <el-input
+              v-model.trim="listQuery.position"
+              placeholder="详细位置"
+              clearable
+              style="width: 162px"
+            />
           </search-item>
         </search-area>
         <table-container>
           <!-- 查询结果Table显示 -->
-          <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-            @change="changePage">
+          <normal-table
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loadingTable"
+            @change="changePage"
+          >
             <template #preColumns>
               <el-table-column label="选择" width="55" align="center">
                 <template #default="scope">
-                  <el-radio v-model="select" :label="scope.$index" class="radio" />
+                  <el-radio
+                    v-model="select"
+                    :label="scope.$index"
+                    class="radio"
+                  />
                 </template>
               </el-table-column>
               <el-table-column label="序号" width="75" align="center">
                 <template #default="scope">
-                  {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+                  {{
+                    ((listQuery.offset as number) - 1) *
+                      (listQuery.limit as number) +
+                    scope.$index +
+                    1
+                  }}
                 </template>
               </el-table-column>
             </template>
             <template #columns>
-
               <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
-                  <el-button type="primary" link size="small" @click="editRow(scope.row)">
+                  <el-button
+                    type="primary"
+                    link
+                    size="small"
+                    @click="editRow(scope.row)"
+                  >
                     编辑
                   </el-button>
                 </template>
@@ -510,12 +695,15 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button :loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button
+          :loading="disabledBtn"
+          :disabled="disabledBtn"
+          type="primary"
+          @click="saveData"
+        >
           确认
         </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <el-button @click="cancel"> 取消 </el-button>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index d8a00bf..c348409 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -30,6 +30,8 @@
   deptid: '', // 管理单位
   ledgerName: '', // 闸井名称
   locationCategory: '',
+    propertyPerson: '',
+  propertyPhone: '',
 }) // 表单
 const listQueryTemporary = ref({
   tagNumber: '', // 安装位号
@@ -110,7 +112,10 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
   { text: '更新时间', value: 'ts', align: 'center' },
+    { text: '负责人', value: 'propertyPerson', align: 'center', width: '100' },
+  { text: '联系电话', value: 'propertyPhone', align: 'center', width: '120' },
   // { text: '操作人', value: 'position', align: 'center' },
+
 ])
 const loadingTable = ref(true)
 const loadingTableTemporary = ref(false)
@@ -222,7 +227,7 @@
 const tableRef = ref()
 const tableRef1 = ref()
 const initDialog = (row: any) => {
-  console.log(row, 'row')
+  // console.log(row, 'row')
   multiSelectData.value = []
   tableRef.value?.clearMulti()
   dialogFormVisible.value = true
@@ -237,6 +242,8 @@
     deptid: '', // 管理单位
     ledgerName: '', // 闸井名称
     locationCategory: '',
+      propertyPerson: '',
+  propertyPhone: '',
   }
   if (row.tagNumber && row.deptid) {
     // 找到绑定关系
@@ -279,6 +286,8 @@
               deptid: row.deptid,
               ledgerName: row.ledgerName,
               locationCategory: res.data.rows[0].locationCategory,
+              propertyPerson: res.data.rows[0].propertyPerson,
+              propertyPhone: res.data.rows[0].propertyPhone,
             }
           }
           else {
@@ -359,7 +368,7 @@
         disabledBtn.value = true
         loading.value = true
         // 先查找是否还有该点位
-        getSyncListPage({ tagNumber: dataForm.value.tagNumber, deptId: dataForm.value.deptid, limit: 1, offset: 1, type: 1 }).then((res) => {
+        getSyncListPage({ tagNumber: dataForm.value.tagNumber, limit: 1, offset: 1, type: 1 }).then((res) => {
           if (res.data.rows.length) {
             disabledBtn.value = false
             //  已经含有
@@ -399,6 +408,8 @@
                 id: data.id,
                 type: '1',
                 locationCategory: dataForm.value.locationCategory,
+                propertyPerson: dataForm.value.propertyPerson,
+                propertyPhone: dataForm.value.propertyPhone,
               }).then((res) => {
                 ElMessage.success('编辑点位成功')
                 emits('confirm', result, 'single')
@@ -426,6 +437,8 @@
               tagNumber: dataForm.value.tagNumber,
               type: '1',
               locationCategory: dataForm.value.locationCategory,
+              propertyPerson: dataForm.value.propertyPerson,
+                propertyPhone: dataForm.value.propertyPhone,
             }).then((res) => {
               ElMessage.success('新建点位成功')
 
@@ -645,11 +658,17 @@
                 <el-input v-model.trim="dataForm.latitude" type="text" placeholder="纬度" style="width: 100%;"
                   clearable />
               </el-form-item>
+              <el-form-item label="负责人" prop="propertyPerson">
+            <el-input v-model.trim="dataForm.propertyPerson" type="text" placeholder="负责人" style="width: 100%;" clearable />
+          </el-form-item>
+          <el-form-item label="联系电话" prop="propertyPhone">
+            <el-input v-model.trim="dataForm.propertyPhone" type="text" placeholder="联系电话" style="width: 100%;" clearable />
+          </el-form-item>
             </el-col>
             <el-col v-if="activeName === '新建点位'" :span="16">
               <!-- 地图 -->
               <a-map ref="mapRef" :show-pieple-layer="true" :center="mapCenter" :zoom="14"
-                style="width: 100%; height: 240px;" @complete="completeMap" @map-click="mapClick" />
+                style="width: 100%; height: 340px;" @complete="completeMap" @map-click="mapClick" />
             </el-col>
           </el-row>
         </el-form>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 8eca8b5..67cc516 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -31,7 +31,9 @@
   ledgerName: '',
   type: '3',
   id: '',
-  locationCategory: ''
+  locationCategory: '',
+  propertyPerson: '',
+  propertyPhone: '',
 }) // 表单
 const rules: FormRules = {
   tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
@@ -91,7 +93,9 @@
       ledgerName: '',
       type: '1',
       id: '',
-      locationCategory: ''
+      locationCategory: '',
+      propertyPerson: '',
+      propertyPhone: '',
     }
     dataFormRef.value?.resetFields()
   }
@@ -209,11 +213,17 @@
           <el-form-item label="纬度" prop="latGaode">
             <el-input v-model.trim="dataForm.latGaode" type="text" placeholder="纬度" style="width: 100%;" clearable />
           </el-form-item>
+          <el-form-item label="负责人" prop="propertyPerson">
+            <el-input v-model.trim="dataForm.propertyPerson" type="text" placeholder="负责人" style="width: 100%;" clearable />
+          </el-form-item>
+          <el-form-item label="联系电话" prop="propertyPhone">
+            <el-input v-model.trim="dataForm.propertyPhone" type="text" placeholder="联系电话" style="width: 100%;" clearable />
+          </el-form-item>
         </el-col>
         <el-col :span="16" v-if="dialogFormVisible">
           <!-- 地图 -->
           <a-map ref="mapRef" :show-pieple-layer="true" :center="mapCenter" :zoom="14" @complete="completeMap"
-            @map-click="mapClick" style="width: 100%; height: 240px;" />
+            @map-click="mapClick" style="width: 100%; height: 340px;" />
         </el-col>
       </el-row>
     </el-form>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index a2665b4..7177293 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -19,14 +19,15 @@
 // 表格初始列
 const columns = ref<any>([
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '位置类别', value: 'locationCategoryName', align: 'center' },
+  { text: '位置类别', value: 'locationCategoryName', align: 'center', width: '130' },
   { text: '详细位置', value: 'position', align: 'center' },
   // { text: '关联管线', value: 'pipeCode', align: 'center' },
   { text: '经度', value: 'lngGaode', align: 'center' },
   { text: '纬度', value: 'latGaode', align: 'center' },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '更新时间', value: 'ts', align: 'center' },
-  // { text: '操作人', value: 'user', align: 'center' },
+  { text: '更新时间', value: 'ts', align: 'center', width: '180' },
+  { text: '负责人', value: 'propertyPerson', align: 'center', width: '100' },
+  { text: '联系电话', value: 'propertyPhone', align: 'center', width: '120' },
 ])
 // 表格最终展示列
 const columnsConfig = ref<any>([])
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 75491ff..d209e2c 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -161,6 +161,20 @@
         }
       }
     })
+    // 处理挂起结束
+    const pending = alarmDynamics.value.find((item: any) => item.process_name === '挂起' && item.confirmValue)
+    if(pending) {
+     const pendingIndex = alarmDynamics.value.findIndex((item: any) => item.process_name === '挂起' && item.confirmValue)
+     // 上一个状态
+     const lastStatus = alarmDynamics.value[pendingIndex - 1]
+     alarmDynamics.value.splice(pendingIndex+ 1, 1, {
+      process_name: `挂起时间到，状态改为${lastStatus?.process_name || ' '}`,
+      approvalTime: pending.confirmValue,
+      approvalPerson: '',
+      dept_name: '',
+      name: ''
+     })
+    }
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index e1b5f09..4467115 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -162,6 +162,20 @@
         }
       }
     })
+    // 处理挂起结束
+    const pending = alarmDynamics.value.find((item: any) => item.process_name === '挂起' && item.confirmValue)
+    if(pending) {
+     const pendingIndex = alarmDynamics.value.findIndex((item: any) => item.process_name === '挂起' && item.confirmValue)
+     // 上一个状态
+     const lastStatus = alarmDynamics.value[pendingIndex - 1]
+     alarmDynamics.value.splice(pendingIndex+ 1, 1, {
+      process_name: `挂起时间到，状态改为${lastStatus?.process_name || ' '}`,
+      approvalTime: pending.confirmValue,
+      approvalPerson: '',
+      dept_name: '',
+      name: ''
+     })
+    }
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/station/station/components/detail.vue b/src/views/home/station/station/components/detail.vue
index bb769c0..2f5e1ae 100644
--- a/src/views/home/station/station/components/detail.vue
+++ b/src/views/home/station/station/components/detail.vue
@@ -73,16 +73,16 @@
   //   align: 'center',
   // },
 
-  {
-    text: '负责人',
-    value: 'personName',
-    align: 'center',
-  },
-  {
-    text: '负责人联系方式',
-    value: 'telephone',
-    align: 'center',
-  },
+  // {
+  //   text: '负责人',
+  //   value: 'personName',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '负责人联系方式',
+  //   value: 'propertyPhone',
+  //   align: 'center',
+  // },
 
   // {
   //   text: '启用日期',
diff --git a/src/views/home/tool/index.vue b/src/views/home/tool/index.vue
index acbbcdd..9254c45 100644
--- a/src/views/home/tool/index.vue
+++ b/src/views/home/tool/index.vue
@@ -280,7 +280,7 @@
     lineType.value = ''
     handlerType.value = ''
   })
-  ElMessage.success('取消成功')
+  ElMessage.success('操作成功')
 }
 const contextmenuFun = event => {
   event.preventDefault()
@@ -435,7 +435,6 @@
 // 鼠标移入设备点位
 const massMarksOver = (data: any) => {
   const target = data.event.data
-  console.log(target, 'target')
   // 定义弹窗
   detail.value = new mapRef.value.AMap.InfoWindow({
     closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体
@@ -484,10 +483,10 @@
         type="primary"
         :disabled="!currentDevice || menuVisible"
         @click="saveLine"
-        >保存线</el-button
+        >保存</el-button
       >
       <el-button :disabled="!currentDevice || menuVisible" @click="cancelLine"
-        >取消线</el-button
+        >{{ handlerType === 'edit' ? '取消' : '删除'}}</el-button
       >
       <el-tooltip placement="bottom">
         <template #content>

diff --git a/public/config/config.json b/public/config/config.json
index 22f4711..1053b40 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://111.198.10.15:11643",
+  "baseUrl": "http://10.30.7.26:20705",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/api/home/alarm/current.ts b/src/api/home/alarm/current.ts
index cc36a2f..d1a2ed1 100644
--- a/src/api/home/alarm/current.ts
+++ b/src/api/home/alarm/current.ts
@@ -67,6 +67,16 @@
     },
   })
 }
+// 手动消警
+export function batchHandDelete(codes: any) {
+  return request({
+    url: '/system/alarmRecords/cancelAlarmByLedgerNumber',
+    method: 'post',
+    data: {
+      codes,
+    },
+  })
+}
 export function exportCurrentAlarm(data: any) {
   return request({
     url: '/system/alarmRecords/batchExport',
diff --git a/src/components.d.ts b/src/components.d.ts
index b6e680f..003b04b 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,21 +74,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
-    VanBackTop: typeof import('vant/es')['BackTop']
-    VanCell: typeof import('vant/es')['Cell']
-    VanCellGroup: typeof import('vant/es')['CellGroup']
-    VanDatePicker: typeof import('vant/es')['DatePicker']
-    VanDialog: typeof import('vant/es')['Dialog']
-    VanEmpty: typeof import('vant/es')['Empty']
-    VanField: typeof import('vant/es')['Field']
-    VanForm: typeof import('vant/es')['Form']
-    VanIcon: typeof import('vant/es')['Icon']
-    VanPicker: typeof import('vant/es')['Picker']
-    VanPickerGroup: typeof import('vant/es')['PickerGroup']
-    VanPopup: typeof import('vant/es')['Popup']
-    VanRadio: typeof import('vant/es')['Radio']
-    VanRadioGroup: typeof import('vant/es')['RadioGroup']
-    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index f0cadbc..c649738 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -186,6 +186,20 @@
         }
       }
     })
+    // 处理挂起结束
+    const pending = alarmDynamics.value.find((item: any) => item.process_name === '挂起' && item.confirmValue)
+    if(pending) {
+     const pendingIndex = alarmDynamics.value.findIndex((item: any) => item.process_name === '挂起' && item.confirmValue)
+     // 上一个状态
+     const lastStatus = alarmDynamics.value[pendingIndex - 1]
+     alarmDynamics.value.splice(pendingIndex+ 1, 1, {
+      process_name: `挂起时间到，状态改为${lastStatus?.process_name || ' '}`,
+      approvalTime: pending.confirmValue,
+      approvalPerson: '',
+      dept_name: '',
+      name: ''
+     })
+    }
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 69fae06..fab569f 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -8,7 +8,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-import { batchDelete, detailAlarm, exportCurrentAlarm, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
+import { batchDelete, batchHandDelete, detailAlarm, exportCurrentAlarm, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
 import { getStationListPage } from '@/api/home/station/station'
 import { getDictByCode } from '@/api/system/dict'
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
@@ -547,6 +547,31 @@
     })
   })
 }
+// 手动消警
+const handAlarm = () => {
+  if (!multipleTable.value.length) {
+    ElMessage.warning('请先选中数据')
+    return
+  }
+   ElMessageBox.confirm(
+    '确定要消除选中的数据吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(res => {
+    batchHandDelete(multipleTable.value.map((item: any) => item.ledgerNumber)).then(res => {
+      ElMessage.success('操作成功')
+      // 清空多选
+      multipleTable.value = []
+      tableRef.value.clearMulti()
+      fetchData()
+    })
+  })
+}
+// batchHandDelete
 // 跳转设备详情
 const toDeviceDetail = (row: any) => {
   if (!row.devcode || !row.devTypeName) {
@@ -779,6 +804,9 @@
           <template #btns-right>
             <!-- 操作 -->
             <div>
+              <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="handAlarm">
+                手动消警
+              </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
                 批量处置
               </el-button>
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index f710718..43a1f5b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -7,7 +7,11 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormRules, TabsPaneContext } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
-import { addPosition, editPosition, getPositionListPage } from '@/api/home/device/device'
+import {
+  addPosition,
+  editPosition,
+  getPositionListPage
+} from '@/api/home/device/device'
 import { getPiePleListPage } from '@/api/home/ledger/pipeline'
 import AMap from '@/components/map/index.vue'
 // import { getDictByCode } from '@/api/system/dict'
@@ -30,14 +34,28 @@
   deptid: '', // 管理单位
   pipeCode: '', // 关联管线
   locationCategory: '',
+  propertyPerson: '',
+  propertyPhone: '',
 }) // 表单
 const rules: FormRules = {
-  tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
-  longitude: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
-  latitude: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }],
-  position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
-  deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
-  pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
+  tagNumber: [
+    { required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }
+  ],
+  longitude: [
+    { required: true, message: '经度不能为空', trigger: ['blur', 'change'] }
+  ],
+  latitude: [
+    { required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }
+  ],
+  position: [
+    { required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }
+  ],
+  deptid: [
+    { required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }
+  ],
+  pipeCode: [
+    { required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }
+  ]
 } // 前端校验规则
 
 const mapRef = ref()
@@ -53,11 +71,14 @@
 // 地图加载完成
 const completeMap = () => {
   if (dataForm.value.longitude && dataForm.value.latitude) {
-    mapRef.value.map?.setCenter([dataForm.value.longitude, dataForm.value.latitude])
+    mapRef.value.map?.setCenter([
+      dataForm.value.longitude,
+      dataForm.value.latitude
+    ])
     mapRef.value.addMarker({
       position: [dataForm.value.longitude, dataForm.value.latitude],
       content: '',
-      label: '',
+      label: ''
     })
   }
   // 加载中心点marker
@@ -80,7 +101,7 @@
   mapRef.value.addMarker({
     position: location,
     content: '',
-    label: '',
+    label: ''
   })
   // 填充坐标信息
   dataForm.value.longitude = e.lnglat.getLng()
@@ -101,6 +122,8 @@
   { text: '管线编号', value: 'pipeCode', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
+      { text: '负责人', value: 'propertyPerson', align: 'center', width: '100' },
+  { text: '联系电话', value: 'propertyPhone', align: 'center', width: '120' },
 ])
 const loadingTable = ref(true)
 //  查询条件
@@ -110,18 +133,20 @@
   tagNumber: '', // 位号
   pipeCode: '', // 编号
   deptId: '', // 管理单位
-  position: '', // 详细位置
+  position: '' // 详细位置
 } as { [key: string]: string | number })
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  getPositionListPage(listQuery.value).then((res) => {
-    list.value = res.data.rows
-    total.value = res.data.total
-    loadingTable.value = false
-  }).catch(() => {
-    loadingTable.value = false
-  })
+  getPositionListPage(listQuery.value)
+    .then(res => {
+      list.value = res.data.rows
+      total.value = res.data.total
+      loadingTable.value = false
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
 }
 fetchData()
 // 重置查询条件f
@@ -132,7 +157,7 @@
     tagNumber: '', // 位号
     pipeCode: '', // 编号
     deptId: '', // 管理单位
-    position: '', // 详细位置
+    position: '' // 详细位置
   }
   fetchData()
 }
@@ -157,49 +182,58 @@
   if (row.tagNumber && row.deptid) {
     // console.log('找到绑定关系')
     loading.value = true
-    getPositionListPage({ tagNumber: row.tagNumber, deptid: row.deptid, offset: 1, limit: 1 }).then(res => {
-      if (res.data.rows.length) {
-        if (Boolean(res.data.rows[0].lngGaode && res.data.rows[0].latGaode)) {
-          const location = [res.data.rows[0].lngGaode, res.data.rows[0].latGaode]
-          mapRef.value.removeMarker()
-          mapRef.value.addMarker({
-            position: location,
-            content: '',
-            label: '',
-          })
-          dataForm.value.longitude = res.data.rows[0].lngGaode
-          dataForm.value.latitude = res.data.rows[0].latGaode
-          mapRef.value.map.setCenter(location)
-          // mapRef.value.map.setZoom(9)
-          // setTimeout(() => {
-          //   mapRef.value.map.setZoom(14)
-          // }, 500)
-        }
-        else {
+    getPositionListPage({
+      tagNumber: row.tagNumber,
+      deptid: row.deptid,
+      offset: 1,
+      limit: 1
+    })
+      .then(res => {
+        if (res.data.rows.length) {
+          if (Boolean(res.data.rows[0].lngGaode && res.data.rows[0].latGaode)) {
+            const location = [
+              res.data.rows[0].lngGaode,
+              res.data.rows[0].latGaode
+            ]
+            mapRef.value.removeMarker()
+            mapRef.value.addMarker({
+              position: location,
+              content: '',
+              label: ''
+            })
+            dataForm.value.longitude = res.data.rows[0].lngGaode
+            dataForm.value.latitude = res.data.rows[0].latGaode
+            mapRef.value.map.setCenter(location)
+            // mapRef.value.map.setZoom(9)
+            // setTimeout(() => {
+            //   mapRef.value.map.setZoom(14)
+            // }, 500)
+          } else {
+            mapRef.value.removeMarker()
+            dataForm.value.longitude = ''
+            dataForm.value.latitude = ''
+            // mapRef.value.map.setCenter([])
+            ElMessage.warning('该点位缺少坐标位置，请选择坐标位置')
+          }
+          dataForm.value.position = res.data.rows[0].position
+          dataForm.value.deptid = row.deptid
+          dataForm.value.tagNumber = row.tagNumber
+          dataForm.value.pipeCode = res.data.rows[0].pipeCode
+          dataForm.value.propertyPerson = res.data.rows[0].propertyPerson
+          dataForm.value.propertyPhone = res.data.rows[0].propertyPhone
+        } else {
           mapRef.value.removeMarker()
           dataForm.value.longitude = ''
           dataForm.value.latitude = ''
-          // mapRef.value.map.setCenter([])
+          dataForm.value.position = ''
           ElMessage.warning('该点位缺少坐标位置，请选择坐标位置')
         }
-        dataForm.value.position = res.data.rows[0].position
-        dataForm.value.deptid = row.deptid
-        dataForm.value.tagNumber = row.tagNumber
-        dataForm.value.pipeCode = res.data.rows[0].pipeCode
-      }
-      else {
-        mapRef.value.removeMarker()
-        dataForm.value.longitude = ''
-        dataForm.value.latitude = ''
-        dataForm.value.position = ''
-        ElMessage.warning('该点位缺少坐标位置，请选择坐标位置')
-      }
-      loading.value = false
-    }).catch(() => {
-      loading.value = false
-    })
-  }
-  else {
+        loading.value = false
+      })
+      .catch(() => {
+        loading.value = false
+      })
+  } else {
     loading.value = false
     // console.log('没有找到绑定关系')
     dataForm.value.longitude = ''
@@ -208,6 +242,8 @@
     dataForm.value.deptid = ''
     dataForm.value.tagNumber = ''
     dataForm.value.pipeCode = ''
+    dataForm.value.propertyPerson = ''
+    dataForm.value.propertyPhone = ''
     // 判断是否同意获取当前位置
     const setInfo = (longitude: string | number, latitude: string | number) => {
       mapRef.value.map.setCenter([longitude, latitude])
@@ -224,44 +260,49 @@
       mapRef.value.addMarker({
         position: [longitude, latitude],
         content: '',
-        label: '',
+        label: ''
       })
     }
     setTimeout(() => {
-      mapRef.value.getLocation((position: any) => {
-        // console.log(position, 'positon')
-        // console.log(position.position.lng, 'positon.positon.lng')
-        setTimeout(() => {
-          setInfo(position.position.lng, position.position.lat)
-        })
-      }, () => {
-        if (!sessionStorage.getItem('longitude')) {
-          getLocation()
+      mapRef.value.getLocation(
+        (position: any) => {
+          // console.log(position, 'positon')
+          // console.log(position.position.lng, 'positon.positon.lng')
           setTimeout(() => {
-            if (sessionStorage.getItem('longitude')) {
-              setInfo(sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string)
-            }
-            else {
-              mapRef.value.map.setCenter(['116.397428', '39.90923'])
-              // mapRef.value.map.setZoom(9)
-              // setTimeout(() => {
-              //   mapRef.value.map.setZoom(14)
-              // }, 500)
-            }
+            setInfo(position.position.lng, position.position.lat)
           })
+        },
+        () => {
+          if (!sessionStorage.getItem('longitude')) {
+            getLocation()
+            setTimeout(() => {
+              if (sessionStorage.getItem('longitude')) {
+                setInfo(
+                  sessionStorage.getItem('longitude') as string,
+                  sessionStorage.getItem('latitude') as string
+                )
+              } else {
+                mapRef.value.map.setCenter(['116.397428', '39.90923'])
+                // mapRef.value.map.setZoom(9)
+                // setTimeout(() => {
+                //   mapRef.value.map.setZoom(14)
+                // }, 500)
+              }
+            })
+          } else {
+            setInfo(
+              sessionStorage.getItem('longitude') as string,
+              sessionStorage.getItem('latitude') as string
+            )
+          }
         }
-        else {
-          setInfo(sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string)
-        }
-      })
+      )
     })
-
   }
-
 }
 const dialogRef = ref()
 defineExpose({
-  initDialog,
+  initDialog
 })
 // 保存数据
 const deptRef = ref()
@@ -273,100 +314,117 @@
         // 先查询是否含有该位号
         getPositionListPage({
           tagNumber: dataForm.value.tagNumber,
-          deptid: dataForm.value.deptid,
-          offset: 1, limit: 1
-        }).then(res => {
-          disabledBtn.value = false
-          if (res.data.rows.length) {
-            //  已经含有
-            ElMessageBox.confirm(
-              '该点位已经存在，确认编辑该点位信息?',
-              '提示',
-              {
-                confirmButtonText: '确认',
-                cancelButtonText: '取消',
-                type: 'warning',
-              }
-            ).then(() => {
+          // deptid: dataForm.value.deptid,
+          offset: 1,
+          limit: 1
+        })
+          .then(res => {
+            disabledBtn.value = false
+            if (res.data.rows.length) {
+              //  已经含有
+              ElMessageBox.confirm(
+                '该点位已经存在，确认编辑该点位信息?',
+                '提示',
+                {
+                  confirmButtonText: '确认',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+                }
+              ).then(() => {
+                loading.value = true
+                const data = res.data.rows[0]
+                const result = {
+                  deptName: data.deptName,
+                  latGaode: data.latGaode,
+                  lngGaode: data.lngGaode,
+                  // pipeCode: data.pipeCode,
+                  // deptid: data.deptid,
+                  // position: data.position,
+                  // tagNumber: data.tagNumber,
+                  // longitude: data.lngGaode, // 经度
+                  // latitude: data.latGaode, // 纬度
+                  id: data.id,
+                  ...dataForm.value
+                }
+                disabledBtn.value = true
+                editPosition({
+                  deptid: dataForm.value.deptid,
+                  latGaode: dataForm.value.latitude,
+                  lngGaode: dataForm.value.longitude,
+                  pipeCode: dataForm.value.pipeCode,
+                  position: dataForm.value.position,
+                  tagNumber: dataForm.value.tagNumber,
+                  id: data.id,
+                  type: '3',
+                  locationCategory: dataForm.value.locationCategory,
+                  propertyPerson: dataForm.value.propertyPerson,
+                  propertyPhone: dataForm.value.propertyPhone,
+                })
+                  .then(res => {
+                    ElMessage.success('编辑点位成功')
+                    emits('confirm', result, 'single')
+                    dialogFormVisible.value = false
+                    loading.value = false
+                    disabledBtn.value = false
+                  })
+                  .catch(() => {
+                    loading.value = false
+                    disabledBtn.value = false
+                  })
+              })
+            } else {
               loading.value = true
-              const data = res.data.rows[0]
-              const result = {
-                deptName: data.deptName,
-                latGaode: data.latGaode,
-                lngGaode: data.lngGaode,
-                // pipeCode: data.pipeCode,
-                // deptid: data.deptid,
-                // position: data.position,
-                // tagNumber: data.tagNumber,
-                // longitude: data.lngGaode, // 经度
-                // latitude: data.latGaode, // 纬度
-                id: data.id,
-                ...dataForm.value,
-              }
               disabledBtn.value = true
-              editPosition({
+              addPosition({
                 deptid: dataForm.value.deptid,
                 latGaode: dataForm.value.latitude,
                 lngGaode: dataForm.value.longitude,
                 pipeCode: dataForm.value.pipeCode,
                 position: dataForm.value.position,
                 tagNumber: dataForm.value.tagNumber,
-                id: data.id,
                 type: '3',
-                locationCategory: dataForm.value.locationCategory
-              }).then(res => {
-                ElMessage.success('编辑点位成功')
-                emits('confirm', result, 'single')
-                dialogFormVisible.value = false
-                loading.value = false
-                disabledBtn.value = false
-              }).catch(() => {
-                loading.value = false
-                disabledBtn.value = false
+                locationCategory: dataForm.value.locationCategory,
+                propertyPerson: dataForm.value.propertyPerson,
+                  propertyPhone: dataForm.value.propertyPhone,
               })
-            })
-          }
-          else {
-            loading.value = true
-            disabledBtn.value = true
-            addPosition({
-              deptid: dataForm.value.deptid,
-              latGaode: dataForm.value.latitude,
-              lngGaode: dataForm.value.longitude,
-              pipeCode: dataForm.value.pipeCode,
-              position: dataForm.value.position,
-              tagNumber: dataForm.value.tagNumber,
-              type: '3',
-              locationCategory: dataForm.value.locationCategory
-            }).then((res) => {
-              if (res.code === 200) {
-                ElMessage.success('新建点位成功')
-                emits('confirm', {
-                  ...dataForm.value,
-                  deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
-                  latGaode: dataForm.value.latitude,
-                  lngGaode: dataForm.value.longitude,
-                  id: res.data,
-                }, 'single')
-                dialogFormVisible.value = false
-                // dialogRef.value.close()
-                loading.value = false
-                disabledBtn.value = false
-              }
-            }).catch(() => {
-              loading.value = false
-              disabledBtn.value = false
-            })
-          }
-        })
+                .then(res => {
+                  if (res.code === 200) {
+                    ElMessage.success('新建点位成功')
+                    emits(
+                      'confirm',
+                      {
+                        ...dataForm.value,
+                        deptName: deptRef.value.fetchDeptTree().length
+                          ? deptRef.value
+                              .fetchDeptTree()
+                              .filter(
+                                (item: any) => item.id === dataForm.value.deptid
+                              ).name
+                          : '',
+                        latGaode: dataForm.value.latitude,
+                        lngGaode: dataForm.value.longitude,
+                        id: res.data
+                      },
+                      'single'
+                    )
+                    dialogFormVisible.value = false
+                    // dialogRef.value.close()
+                    loading.value = false
+                    disabledBtn.value = false
+                  }
+                })
+                .catch(() => {
+                  loading.value = false
+                  disabledBtn.value = false
+                })
+            }
+          })
           .catch(() => {
             disabledBtn.value = false
           })
-
       }
     })
-  }
-  else {
+  } else {
     if (select.value === -1) {
       ElMessage.warning('请选择数据')
       return
@@ -385,14 +443,14 @@
 const locationTypeList = ref<{ id: string; name: string; value: string }[]>([])
 // 获取字典
 const fetchDict = () => {
-  getPiePleListPage({ offset: 1, limit: 99999 }).then((res) => {
+  getPiePleListPage({ offset: 1, limit: 99999 }).then(res => {
     pipeList.value = res.data.rows.map((item: any) => ({
       name: item.pipeCode,
       id: item.pipeCode,
-      value: item.pipeCode,
+      value: item.pipeCode
     }))
   })
-  getDictByCode('locationType').then((res) => {
+  getDictByCode('locationType').then(res => {
     locationTypeList.value = res.data
   })
 }
@@ -401,64 +459,152 @@
 // 编辑临时点位
 const editRef = ref()
 const editRow = (row: any) => {
-    // console.log(row, '111')
-    editRef.value.initDialog('edit', row)
+  // console.log(row, '111')
+  editRef.value.initDialog('edit', row)
 }
 </script>
 
 <template>
-  <el-dialog ref="dialogRef" v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
+  <el-dialog
+    ref="dialogRef"
+    v-model="dialogFormVisible"
+    title="选择安装位置"
+    append-to-body
+    width="70%"
+  >
     <addDialog ref="editRef" @refresh="fetchData" />
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane v-loading="loading" label="新建/编辑点位" name="新建点位">
-        <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
+        <el-form
+          ref="dataFormRef"
+          :rules="rules"
+          :model="dataForm"
+          label-position="right"
+          label-width="80px"
+        >
           <el-row :gutter="24">
             <el-col :span="6">
               <el-form-item label="安装位号" prop="tagNumber">
-                <el-input v-model.trim="dataForm.tagNumber" type="text" placeholder="安装位号" style="width: 100%;"
-                  clearable />
+                <el-input
+                  v-model.trim="dataForm.tagNumber"
+                  type="text"
+                  placeholder="安装位号"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="位置类别">
-                <el-select v-model="dataForm.locationCategory" placeholder="位置类别" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in locationTypeList" :key="item.id" :label="item.name" :value="item.value" />
+                <el-select
+                  v-model="dataForm.locationCategory"
+                  placeholder="位置类别"
+                  style="width: 100%"
+                  clearable
+                  filterable
+                >
+                  <el-option
+                    v-for="item in locationTypeList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.value"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="关联管线">
-                <el-select v-model="dataForm.pipeCode" placeholder="关联管线" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in pipeList" :key="item.id" :label="item.name" :value="item.value" />
+                <el-select
+                  v-model="dataForm.pipeCode"
+                  placeholder="关联管线"
+                  style="width: 100%"
+                  clearable
+                  filterable
+                >
+                  <el-option
+                    v-for="item in pipeList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.value"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="管理单位" prop="deptid">
-                <dept-select ref="deptRef" v-model="dataForm.deptid" placeholder="管理单位" :clearable="true"
-                  style="width: 100%;" />
+                <dept-select
+                  ref="deptRef"
+                  v-model="dataForm.deptid"
+                  placeholder="管理单位"
+                  :clearable="true"
+                  style="width: 100%"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="8">
               <el-form-item label="详细位置" prop="position">
-                <el-input v-model.trim="dataForm.position" type="textarea" :rows="6" placeholder="详细位置"
-                  style="width: 100%;" clearable />
+                <el-input
+                  v-model.trim="dataForm.position"
+                  type="textarea"
+                  :rows="6"
+                  placeholder="详细位置"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
               <el-form-item label="经度" prop="longitude">
-                <el-input v-model.trim="dataForm.longitude" type="text" placeholder="经度" style="width: 100%;"
-                  clearable />
+                <el-input
+                  v-model.trim="dataForm.longitude"
+                  type="text"
+                  placeholder="经度"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
               <el-form-item label="纬度" prop="latitude">
-                <el-input v-model.trim="dataForm.latitude" type="text" placeholder="纬度" style="width: 100%;"
-                  clearable />
+                <el-input
+                  v-model.trim="dataForm.latitude"
+                  type="text"
+                  placeholder="纬度"
+                  style="width: 100%"
+                  clearable
+                />
+              </el-form-item>
+              <el-form-item label="负责人" prop="propertyPerson">
+                <el-input
+                  v-model.trim="dataForm.propertyPerson"
+                  type="text"
+                  placeholder="负责人"
+                  style="width: 100%"
+                  clearable
+                />
+              </el-form-item>
+              <el-form-item label="联系电话" prop="propertyPhone">
+                <el-input
+                  v-model.trim="dataForm.propertyPhone"
+                  type="text"
+                  placeholder="联系电话"
+                  style="width: 100%"
+                  clearable
+                />
               </el-form-item>
             </el-col>
-            <el-col :span="16" v-if="dialogFormVisible && activeName === '新建点位'">
+            <el-col
+              :span="16"
+              v-if="dialogFormVisible && activeName === '新建点位'"
+            >
               <!-- 地图 -->
-              <a-map ref="mapRef" :show-pieple-layer="true" :center="mapCenter" :zoom="14" @complete="completeMap"
-                @map-click="mapClick" style="width: 100%; height: 240px;" />
+              <a-map
+                ref="mapRef"
+                :show-pieple-layer="true"
+                :center="mapCenter"
+                :zoom="14"
+                @complete="completeMap"
+                @map-click="mapClick"
+                style="width: 100%; height: 340px"
+              />
             </el-col>
           </el-row>
         </el-form>
@@ -466,39 +612,78 @@
       <el-tab-pane label="既有位置" name="既有位置">
         <search-area :need-clear="true" @search="fetchData" @clear="reset">
           <search-item>
-            <el-input v-model.trim="listQuery.tagNumber" placeholder="安装位号" clearable style="width: 162px;" />
+            <el-input
+              v-model.trim="listQuery.tagNumber"
+              placeholder="安装位号"
+              clearable
+              style="width: 162px"
+            />
           </search-item>
           <search-item>
-            <el-input v-model.trim="listQuery.pipeCode" placeholder="管线编号" clearable style="width: 162px;" />
+            <el-input
+              v-model.trim="listQuery.pipeCode"
+              placeholder="管线编号"
+              clearable
+              style="width: 162px"
+            />
           </search-item>
           <search-item>
-            <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 162px;" />
+            <dept-select
+              v-model="listQuery.deptId"
+              placeholder="管理单位"
+              :clearable="true"
+              style="width: 162px"
+            />
           </search-item>
           <search-item>
-            <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 162px;" />
+            <el-input
+              v-model.trim="listQuery.position"
+              placeholder="详细位置"
+              clearable
+              style="width: 162px"
+            />
           </search-item>
         </search-area>
         <table-container>
           <!-- 查询结果Table显示 -->
-          <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-            @change="changePage">
+          <normal-table
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loadingTable"
+            @change="changePage"
+          >
             <template #preColumns>
               <el-table-column label="选择" width="55" align="center">
                 <template #default="scope">
-                  <el-radio v-model="select" :label="scope.$index" class="radio" />
+                  <el-radio
+                    v-model="select"
+                    :label="scope.$index"
+                    class="radio"
+                  />
                 </template>
               </el-table-column>
               <el-table-column label="序号" width="75" align="center">
                 <template #default="scope">
-                  {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+                  {{
+                    ((listQuery.offset as number) - 1) *
+                      (listQuery.limit as number) +
+                    scope.$index +
+                    1
+                  }}
                 </template>
               </el-table-column>
             </template>
             <template #columns>
-
               <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
-                  <el-button type="primary" link size="small" @click="editRow(scope.row)">
+                  <el-button
+                    type="primary"
+                    link
+                    size="small"
+                    @click="editRow(scope.row)"
+                  >
                     编辑
                   </el-button>
                 </template>
@@ -510,12 +695,15 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button :loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button
+          :loading="disabledBtn"
+          :disabled="disabledBtn"
+          type="primary"
+          @click="saveData"
+        >
           确认
         </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
+        <el-button @click="cancel"> 取消 </el-button>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index d8a00bf..c348409 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -30,6 +30,8 @@
   deptid: '', // 管理单位
   ledgerName: '', // 闸井名称
   locationCategory: '',
+    propertyPerson: '',
+  propertyPhone: '',
 }) // 表单
 const listQueryTemporary = ref({
   tagNumber: '', // 安装位号
@@ -110,7 +112,10 @@
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
   { text: '更新时间', value: 'ts', align: 'center' },
+    { text: '负责人', value: 'propertyPerson', align: 'center', width: '100' },
+  { text: '联系电话', value: 'propertyPhone', align: 'center', width: '120' },
   // { text: '操作人', value: 'position', align: 'center' },
+
 ])
 const loadingTable = ref(true)
 const loadingTableTemporary = ref(false)
@@ -222,7 +227,7 @@
 const tableRef = ref()
 const tableRef1 = ref()
 const initDialog = (row: any) => {
-  console.log(row, 'row')
+  // console.log(row, 'row')
   multiSelectData.value = []
   tableRef.value?.clearMulti()
   dialogFormVisible.value = true
@@ -237,6 +242,8 @@
     deptid: '', // 管理单位
     ledgerName: '', // 闸井名称
     locationCategory: '',
+      propertyPerson: '',
+  propertyPhone: '',
   }
   if (row.tagNumber && row.deptid) {
     // 找到绑定关系
@@ -279,6 +286,8 @@
               deptid: row.deptid,
               ledgerName: row.ledgerName,
               locationCategory: res.data.rows[0].locationCategory,
+              propertyPerson: res.data.rows[0].propertyPerson,
+              propertyPhone: res.data.rows[0].propertyPhone,
             }
           }
           else {
@@ -359,7 +368,7 @@
         disabledBtn.value = true
         loading.value = true
         // 先查找是否还有该点位
-        getSyncListPage({ tagNumber: dataForm.value.tagNumber, deptId: dataForm.value.deptid, limit: 1, offset: 1, type: 1 }).then((res) => {
+        getSyncListPage({ tagNumber: dataForm.value.tagNumber, limit: 1, offset: 1, type: 1 }).then((res) => {
           if (res.data.rows.length) {
             disabledBtn.value = false
             //  已经含有
@@ -399,6 +408,8 @@
                 id: data.id,
                 type: '1',
                 locationCategory: dataForm.value.locationCategory,
+                propertyPerson: dataForm.value.propertyPerson,
+                propertyPhone: dataForm.value.propertyPhone,
               }).then((res) => {
                 ElMessage.success('编辑点位成功')
                 emits('confirm', result, 'single')
@@ -426,6 +437,8 @@
               tagNumber: dataForm.value.tagNumber,
               type: '1',
               locationCategory: dataForm.value.locationCategory,
+              propertyPerson: dataForm.value.propertyPerson,
+                propertyPhone: dataForm.value.propertyPhone,
             }).then((res) => {
               ElMessage.success('新建点位成功')
 
@@ -645,11 +658,17 @@
                 <el-input v-model.trim="dataForm.latitude" type="text" placeholder="纬度" style="width: 100%;"
                   clearable />
               </el-form-item>
+              <el-form-item label="负责人" prop="propertyPerson">
+            <el-input v-model.trim="dataForm.propertyPerson" type="text" placeholder="负责人" style="width: 100%;" clearable />
+          </el-form-item>
+          <el-form-item label="联系电话" prop="propertyPhone">
+            <el-input v-model.trim="dataForm.propertyPhone" type="text" placeholder="联系电话" style="width: 100%;" clearable />
+          </el-form-item>
             </el-col>
             <el-col v-if="activeName === '新建点位'" :span="16">
               <!-- 地图 -->
               <a-map ref="mapRef" :show-pieple-layer="true" :center="mapCenter" :zoom="14"
-                style="width: 100%; height: 240px;" @complete="completeMap" @map-click="mapClick" />
+                style="width: 100%; height: 340px;" @complete="completeMap" @map-click="mapClick" />
             </el-col>
           </el-row>
         </el-form>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 8eca8b5..67cc516 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -31,7 +31,9 @@
   ledgerName: '',
   type: '3',
   id: '',
-  locationCategory: ''
+  locationCategory: '',
+  propertyPerson: '',
+  propertyPhone: '',
 }) // 表单
 const rules: FormRules = {
   tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
@@ -91,7 +93,9 @@
       ledgerName: '',
       type: '1',
       id: '',
-      locationCategory: ''
+      locationCategory: '',
+      propertyPerson: '',
+      propertyPhone: '',
     }
     dataFormRef.value?.resetFields()
   }
@@ -209,11 +213,17 @@
           <el-form-item label="纬度" prop="latGaode">
             <el-input v-model.trim="dataForm.latGaode" type="text" placeholder="纬度" style="width: 100%;" clearable />
           </el-form-item>
+          <el-form-item label="负责人" prop="propertyPerson">
+            <el-input v-model.trim="dataForm.propertyPerson" type="text" placeholder="负责人" style="width: 100%;" clearable />
+          </el-form-item>
+          <el-form-item label="联系电话" prop="propertyPhone">
+            <el-input v-model.trim="dataForm.propertyPhone" type="text" placeholder="联系电话" style="width: 100%;" clearable />
+          </el-form-item>
         </el-col>
         <el-col :span="16" v-if="dialogFormVisible">
           <!-- 地图 -->
           <a-map ref="mapRef" :show-pieple-layer="true" :center="mapCenter" :zoom="14" @complete="completeMap"
-            @map-click="mapClick" style="width: 100%; height: 240px;" />
+            @map-click="mapClick" style="width: 100%; height: 340px;" />
         </el-col>
       </el-row>
     </el-form>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index a2665b4..7177293 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -19,14 +19,15 @@
 // 表格初始列
 const columns = ref<any>([
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '位置类别', value: 'locationCategoryName', align: 'center' },
+  { text: '位置类别', value: 'locationCategoryName', align: 'center', width: '130' },
   { text: '详细位置', value: 'position', align: 'center' },
   // { text: '关联管线', value: 'pipeCode', align: 'center' },
   { text: '经度', value: 'lngGaode', align: 'center' },
   { text: '纬度', value: 'latGaode', align: 'center' },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '更新时间', value: 'ts', align: 'center' },
-  // { text: '操作人', value: 'user', align: 'center' },
+  { text: '更新时间', value: 'ts', align: 'center', width: '180' },
+  { text: '负责人', value: 'propertyPerson', align: 'center', width: '100' },
+  { text: '联系电话', value: 'propertyPhone', align: 'center', width: '120' },
 ])
 // 表格最终展示列
 const columnsConfig = ref<any>([])
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 75491ff..d209e2c 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -161,6 +161,20 @@
         }
       }
     })
+    // 处理挂起结束
+    const pending = alarmDynamics.value.find((item: any) => item.process_name === '挂起' && item.confirmValue)
+    if(pending) {
+     const pendingIndex = alarmDynamics.value.findIndex((item: any) => item.process_name === '挂起' && item.confirmValue)
+     // 上一个状态
+     const lastStatus = alarmDynamics.value[pendingIndex - 1]
+     alarmDynamics.value.splice(pendingIndex+ 1, 1, {
+      process_name: `挂起时间到，状态改为${lastStatus?.process_name || ' '}`,
+      approvalTime: pending.confirmValue,
+      approvalPerson: '',
+      dept_name: '',
+      name: ''
+     })
+    }
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index e1b5f09..4467115 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -162,6 +162,20 @@
         }
       }
     })
+    // 处理挂起结束
+    const pending = alarmDynamics.value.find((item: any) => item.process_name === '挂起' && item.confirmValue)
+    if(pending) {
+     const pendingIndex = alarmDynamics.value.findIndex((item: any) => item.process_name === '挂起' && item.confirmValue)
+     // 上一个状态
+     const lastStatus = alarmDynamics.value[pendingIndex - 1]
+     alarmDynamics.value.splice(pendingIndex+ 1, 1, {
+      process_name: `挂起时间到，状态改为${lastStatus?.process_name || ' '}`,
+      approvalTime: pending.confirmValue,
+      approvalPerson: '',
+      dept_name: '',
+      name: ''
+     })
+    }
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
diff --git a/src/views/home/station/station/components/detail.vue b/src/views/home/station/station/components/detail.vue
index bb769c0..2f5e1ae 100644
--- a/src/views/home/station/station/components/detail.vue
+++ b/src/views/home/station/station/components/detail.vue
@@ -73,16 +73,16 @@
   //   align: 'center',
   // },
 
-  {
-    text: '负责人',
-    value: 'personName',
-    align: 'center',
-  },
-  {
-    text: '负责人联系方式',
-    value: 'telephone',
-    align: 'center',
-  },
+  // {
+  //   text: '负责人',
+  //   value: 'personName',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '负责人联系方式',
+  //   value: 'propertyPhone',
+  //   align: 'center',
+  // },
 
   // {
   //   text: '启用日期',
diff --git a/src/views/home/tool/index.vue b/src/views/home/tool/index.vue
index acbbcdd..9254c45 100644
--- a/src/views/home/tool/index.vue
+++ b/src/views/home/tool/index.vue
@@ -280,7 +280,7 @@
     lineType.value = ''
     handlerType.value = ''
   })
-  ElMessage.success('取消成功')
+  ElMessage.success('操作成功')
 }
 const contextmenuFun = event => {
   event.preventDefault()
@@ -435,7 +435,6 @@
 // 鼠标移入设备点位
 const massMarksOver = (data: any) => {
   const target = data.event.data
-  console.log(target, 'target')
   // 定义弹窗
   detail.value = new mapRef.value.AMap.InfoWindow({
     closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体
@@ -484,10 +483,10 @@
         type="primary"
         :disabled="!currentDevice || menuVisible"
         @click="saveLine"
-        >保存线</el-button
+        >保存</el-button
       >
       <el-button :disabled="!currentDevice || menuVisible" @click="cancelLine"
-        >取消线</el-button
+        >{{ handlerType === 'edit' ? '取消' : '删除'}}</el-button
       >
       <el-tooltip placement="bottom">
         <template #content>
diff --git a/src/views/home/well/components/detail.vue b/src/views/home/well/components/detail.vue
index b86534c..5b22e60 100644
--- a/src/views/home/well/components/detail.vue
+++ b/src/views/home/well/components/detail.vue
@@ -45,16 +45,16 @@
     value: 'propertyOwner',
     align: 'center',
   },
-  {
-    text: '产权单位联系人',
-    value: 'propertyPerson',
-    align: 'center',
-  },
-  {
-    text: '产权单位联系电话',
-    value: 'propertyPhone',
-    align: 'center',
-  },
+  // {
+  //   text: '产权单位联系人',
+  //   value: 'propertyPerson',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '产权单位联系电话',
+  //   value: 'propertyPhone',
+  //   align: 'center',
+  // },
   {
     text: '管理方式',
     value: 'manageTypeName',
@@ -67,12 +67,12 @@
   },
   {
     text: '负责人',
-    value: 'personName',
+    value: 'propertyPerson',
     align: 'center',
   },
   {
     text: '负责人联系方式',
-    value: 'telephone',
+    value: 'propertyPhone',
     align: 'center',
   },
   {