diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts
new file mode 100644
index 0000000..2723ec8
--- /dev/null
+++ b/src/api/home/operation/alarm.ts
@@ -0,0 +1,41 @@
+/**
+ * 设备当前报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceCurrentListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查看
+export function deviceAlarmView(id: any) {
+  return request({
+    url: '/maintenance/alarmRecords/deviceAlarmView',
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+// 挂起
+export function pendingDeviceAlarm(data: any) {
+  return request({
+    url: '/maintenance/alarmRecords/suspend',
+    method: 'post',
+    data,
+  })
+}
+// 批量删除
+export function batchRemoveRow(ids: any) {
+  return request({
+    url: '/maintenance/alarmRecords/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}

diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts
new file mode 100644
index 0000000..2723ec8
--- /dev/null
+++ b/src/api/home/operation/alarm.ts
@@ -0,0 +1,41 @@
+/**
+ * 设备当前报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceCurrentListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查看
+export function deviceAlarmView(id: any) {
+  return request({
+    url: '/maintenance/alarmRecords/deviceAlarmView',
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+// 挂起
+export function pendingDeviceAlarm(data: any) {
+  return request({
+    url: '/maintenance/alarmRecords/suspend',
+    method: 'post',
+    data,
+  })
+}
+// 批量删除
+export function batchRemoveRow(ids: any) {
+  return request({
+    url: '/maintenance/alarmRecords/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts
new file mode 100644
index 0000000..a26ad3f
--- /dev/null
+++ b/src/api/home/operation/history.ts
@@ -0,0 +1,14 @@
+/**
+ * 设备历史报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceHistoryListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/historyListPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+

diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts
new file mode 100644
index 0000000..2723ec8
--- /dev/null
+++ b/src/api/home/operation/alarm.ts
@@ -0,0 +1,41 @@
+/**
+ * 设备当前报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceCurrentListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查看
+export function deviceAlarmView(id: any) {
+  return request({
+    url: '/maintenance/alarmRecords/deviceAlarmView',
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+// 挂起
+export function pendingDeviceAlarm(data: any) {
+  return request({
+    url: '/maintenance/alarmRecords/suspend',
+    method: 'post',
+    data,
+  })
+}
+// 批量删除
+export function batchRemoveRow(ids: any) {
+  return request({
+    url: '/maintenance/alarmRecords/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts
new file mode 100644
index 0000000..a26ad3f
--- /dev/null
+++ b/src/api/home/operation/history.ts
@@ -0,0 +1,14 @@
+/**
+ * 设备历史报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceHistoryListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/historyListPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index ed722fb..6f58857 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -355,6 +355,19 @@
         },
       },
       {
+        path: 'alarm/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationAlarmDetail',
+        meta: {
+          title: '设备报警详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/alarm',
+          auth: '/operation/alarm',
+        },
+      },
+      {
         path: 'history',
         component: () => import('@/views/home/operation/history/index.vue'),
         name: 'operationHistory',
@@ -368,6 +381,19 @@
         },
       },
       {
+        path: 'history/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationHistoryDetail',
+        meta: {
+          title: '历史设备报警',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/history',
+          auth: '/operation/history',
+        },
+      },
+      {
         path: 'trajectory',
         component: () => import('@/views/home/operation/trajectory/index.vue'),
         name: 'operationTrajectory',

diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts
new file mode 100644
index 0000000..2723ec8
--- /dev/null
+++ b/src/api/home/operation/alarm.ts
@@ -0,0 +1,41 @@
+/**
+ * 设备当前报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceCurrentListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查看
+export function deviceAlarmView(id: any) {
+  return request({
+    url: '/maintenance/alarmRecords/deviceAlarmView',
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+// 挂起
+export function pendingDeviceAlarm(data: any) {
+  return request({
+    url: '/maintenance/alarmRecords/suspend',
+    method: 'post',
+    data,
+  })
+}
+// 批量删除
+export function batchRemoveRow(ids: any) {
+  return request({
+    url: '/maintenance/alarmRecords/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts
new file mode 100644
index 0000000..a26ad3f
--- /dev/null
+++ b/src/api/home/operation/history.ts
@@ -0,0 +1,14 @@
+/**
+ * 设备历史报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceHistoryListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/historyListPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index ed722fb..6f58857 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -355,6 +355,19 @@
         },
       },
       {
+        path: 'alarm/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationAlarmDetail',
+        meta: {
+          title: '设备报警详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/alarm',
+          auth: '/operation/alarm',
+        },
+      },
+      {
         path: 'history',
         component: () => import('@/views/home/operation/history/index.vue'),
         name: 'operationHistory',
@@ -368,6 +381,19 @@
         },
       },
       {
+        path: 'history/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationHistoryDetail',
+        meta: {
+          title: '历史设备报警',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/history',
+          auth: '/operation/history',
+        },
+      },
+      {
         path: 'trajectory',
         component: () => import('@/views/home/operation/trajectory/index.vue'),
         name: 'operationTrajectory',
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 7ac6332..30aa05e 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -9,6 +9,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import processDialog from './processDialog.vue'
 import { detailAlarm } from '@/api/home/alarm/current'
+import { deviceAlarmView } from '@/api/home/operation/alarm'
 import { toHumpObject } from '@/utils/String'
 const dialogFormVisible = ref(false)
 const overlay = ref()
@@ -32,15 +33,20 @@
   processContent: '',
   processStatus: '',
   id: '',
+  type: '',
 })
+const type = ref('')
 const initDialog = (e: any) => {
   console.log(e, '信息窗体接收的数据')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   dialogFormVisible.value = true
-  info.value = e.info
-  detailAlarm(e.info.id).then((res) => {
+  type.value = e.type
+  info.value = e.info;
+
+  (type.value === 'data' ? detailAlarm : deviceAlarmView)(e.info.id).then((res) => {
     info.value = toHumpObject(res.data) as any
+    console.log(info.value, 'info.value')
   })
 }
 
@@ -53,13 +59,26 @@
 const $router = useRouter()
 const moreData = () => {
   $router.push({
-    name: 'AlarmCurrentDetail',
+    name: type.value === 'data' ? 'AlarmCurrentDetail' : 'operationAlarmDetail',
     query: {
       id: info.value.id,
       row: JSON.stringify(info.value),
     },
   })
 }
+// 设备详情
+const goDevice = () => {
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
 // 提醒责任人
 const remindRef = ref()
 const remind = () => {
@@ -68,13 +87,18 @@
 // 挂起
 const pendingRef = ref()
 const pending = () => {
-  pendingRef.value.initDialog(info.value)
+  pendingRef.value.initDialog({ ...info.value, type: type.value })
 }
 // 查看流程
 const processRef = ref()
 const viewProcess = () => {
   processRef.value.initDialog(info.value)
 }
+// 报警处置
+const handlerRef = ref()
+const handler = () => {
+  handlerRef.value.initDialog(info.value)
+}
 defineExpose({ initDialog, close })
 </script>
 
@@ -94,7 +118,13 @@
       <span class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备编号:
+        <span style="padding-left: 6px;" class="more" @click="goDevice">
+          {{ info.devcode }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警类别:
         <span style="padding-left: 6px;">
           {{ info.alarmCategory }}
@@ -106,7 +136,13 @@
           {{ info.alarmMsg }}
         </span>
       </div>
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备类型:
+        <span style="padding-left: 6px;">
+          {{ info.devTypeName }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
@@ -164,7 +200,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -176,9 +212,12 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4" size="small" @click="remind">
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
         提醒责任人
       </el-button>
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'device'" size="small" @click="handler">
+        报警处置
+      </el-button>
       <el-button v-if="Number(info.processStatus) <= 3" type="primary" size="small" @click="pending">
         挂起
       </el-button>
@@ -233,14 +272,14 @@
     display: flex;
     justify-content: space-between;
     font-size: 16px;
+  }
 
-    .more {
-      color: #3d7eff;
+  .more {
+    color: #3d7eff;
 
-      &:hover {
-        cursor: pointer;
-        text-decoration: underline;
-      }
+    &:hover {
+      cursor: pointer;
+      text-decoration: underline;
     }
   }
 

diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts
new file mode 100644
index 0000000..2723ec8
--- /dev/null
+++ b/src/api/home/operation/alarm.ts
@@ -0,0 +1,41 @@
+/**
+ * 设备当前报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceCurrentListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查看
+export function deviceAlarmView(id: any) {
+  return request({
+    url: '/maintenance/alarmRecords/deviceAlarmView',
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+// 挂起
+export function pendingDeviceAlarm(data: any) {
+  return request({
+    url: '/maintenance/alarmRecords/suspend',
+    method: 'post',
+    data,
+  })
+}
+// 批量删除
+export function batchRemoveRow(ids: any) {
+  return request({
+    url: '/maintenance/alarmRecords/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts
new file mode 100644
index 0000000..a26ad3f
--- /dev/null
+++ b/src/api/home/operation/history.ts
@@ -0,0 +1,14 @@
+/**
+ * 设备历史报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceHistoryListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/historyListPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index ed722fb..6f58857 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -355,6 +355,19 @@
         },
       },
       {
+        path: 'alarm/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationAlarmDetail',
+        meta: {
+          title: '设备报警详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/alarm',
+          auth: '/operation/alarm',
+        },
+      },
+      {
         path: 'history',
         component: () => import('@/views/home/operation/history/index.vue'),
         name: 'operationHistory',
@@ -368,6 +381,19 @@
         },
       },
       {
+        path: 'history/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationHistoryDetail',
+        meta: {
+          title: '历史设备报警',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/history',
+          auth: '/operation/history',
+        },
+      },
+      {
         path: 'trajectory',
         component: () => import('@/views/home/operation/trajectory/index.vue'),
         name: 'operationTrajectory',
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 7ac6332..30aa05e 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -9,6 +9,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import processDialog from './processDialog.vue'
 import { detailAlarm } from '@/api/home/alarm/current'
+import { deviceAlarmView } from '@/api/home/operation/alarm'
 import { toHumpObject } from '@/utils/String'
 const dialogFormVisible = ref(false)
 const overlay = ref()
@@ -32,15 +33,20 @@
   processContent: '',
   processStatus: '',
   id: '',
+  type: '',
 })
+const type = ref('')
 const initDialog = (e: any) => {
   console.log(e, '信息窗体接收的数据')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   dialogFormVisible.value = true
-  info.value = e.info
-  detailAlarm(e.info.id).then((res) => {
+  type.value = e.type
+  info.value = e.info;
+
+  (type.value === 'data' ? detailAlarm : deviceAlarmView)(e.info.id).then((res) => {
     info.value = toHumpObject(res.data) as any
+    console.log(info.value, 'info.value')
   })
 }
 
@@ -53,13 +59,26 @@
 const $router = useRouter()
 const moreData = () => {
   $router.push({
-    name: 'AlarmCurrentDetail',
+    name: type.value === 'data' ? 'AlarmCurrentDetail' : 'operationAlarmDetail',
     query: {
       id: info.value.id,
       row: JSON.stringify(info.value),
     },
   })
 }
+// 设备详情
+const goDevice = () => {
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
 // 提醒责任人
 const remindRef = ref()
 const remind = () => {
@@ -68,13 +87,18 @@
 // 挂起
 const pendingRef = ref()
 const pending = () => {
-  pendingRef.value.initDialog(info.value)
+  pendingRef.value.initDialog({ ...info.value, type: type.value })
 }
 // 查看流程
 const processRef = ref()
 const viewProcess = () => {
   processRef.value.initDialog(info.value)
 }
+// 报警处置
+const handlerRef = ref()
+const handler = () => {
+  handlerRef.value.initDialog(info.value)
+}
 defineExpose({ initDialog, close })
 </script>
 
@@ -94,7 +118,13 @@
       <span class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备编号:
+        <span style="padding-left: 6px;" class="more" @click="goDevice">
+          {{ info.devcode }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警类别:
         <span style="padding-left: 6px;">
           {{ info.alarmCategory }}
@@ -106,7 +136,13 @@
           {{ info.alarmMsg }}
         </span>
       </div>
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备类型:
+        <span style="padding-left: 6px;">
+          {{ info.devTypeName }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
@@ -164,7 +200,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -176,9 +212,12 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4" size="small" @click="remind">
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
         提醒责任人
       </el-button>
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'device'" size="small" @click="handler">
+        报警处置
+      </el-button>
       <el-button v-if="Number(info.processStatus) <= 3" type="primary" size="small" @click="pending">
         挂起
       </el-button>
@@ -233,14 +272,14 @@
     display: flex;
     justify-content: space-between;
     font-size: 16px;
+  }
 
-    .more {
-      color: #3d7eff;
+  .more {
+    color: #3d7eff;
 
-      &:hover {
-        cursor: pointer;
-        text-decoration: underline;
-      }
+    &:hover {
+      cursor: pointer;
+      text-decoration: underline;
     }
   }
 
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index 6e1b260..a8b44a6 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -46,6 +46,7 @@
     infoWindow: detail.value,
     info: $props.data,
     map: mapRef.value.map,
+    type: 'data',
   })
   setTimeout(() => {
     // mapRef.value.map.setFitView()
@@ -75,6 +76,7 @@
       infoWindow: detail.value,
       info: data,
       map: mapRef.value.map,
+      type: 'data',
     })
     setTimeout(() => {
       // mapRef.value.map.setFitView()

diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts
new file mode 100644
index 0000000..2723ec8
--- /dev/null
+++ b/src/api/home/operation/alarm.ts
@@ -0,0 +1,41 @@
+/**
+ * 设备当前报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceCurrentListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查看
+export function deviceAlarmView(id: any) {
+  return request({
+    url: '/maintenance/alarmRecords/deviceAlarmView',
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+// 挂起
+export function pendingDeviceAlarm(data: any) {
+  return request({
+    url: '/maintenance/alarmRecords/suspend',
+    method: 'post',
+    data,
+  })
+}
+// 批量删除
+export function batchRemoveRow(ids: any) {
+  return request({
+    url: '/maintenance/alarmRecords/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts
new file mode 100644
index 0000000..a26ad3f
--- /dev/null
+++ b/src/api/home/operation/history.ts
@@ -0,0 +1,14 @@
+/**
+ * 设备历史报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceHistoryListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/historyListPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index ed722fb..6f58857 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -355,6 +355,19 @@
         },
       },
       {
+        path: 'alarm/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationAlarmDetail',
+        meta: {
+          title: '设备报警详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/alarm',
+          auth: '/operation/alarm',
+        },
+      },
+      {
         path: 'history',
         component: () => import('@/views/home/operation/history/index.vue'),
         name: 'operationHistory',
@@ -368,6 +381,19 @@
         },
       },
       {
+        path: 'history/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationHistoryDetail',
+        meta: {
+          title: '历史设备报警',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/history',
+          auth: '/operation/history',
+        },
+      },
+      {
         path: 'trajectory',
         component: () => import('@/views/home/operation/trajectory/index.vue'),
         name: 'operationTrajectory',
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 7ac6332..30aa05e 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -9,6 +9,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import processDialog from './processDialog.vue'
 import { detailAlarm } from '@/api/home/alarm/current'
+import { deviceAlarmView } from '@/api/home/operation/alarm'
 import { toHumpObject } from '@/utils/String'
 const dialogFormVisible = ref(false)
 const overlay = ref()
@@ -32,15 +33,20 @@
   processContent: '',
   processStatus: '',
   id: '',
+  type: '',
 })
+const type = ref('')
 const initDialog = (e: any) => {
   console.log(e, '信息窗体接收的数据')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   dialogFormVisible.value = true
-  info.value = e.info
-  detailAlarm(e.info.id).then((res) => {
+  type.value = e.type
+  info.value = e.info;
+
+  (type.value === 'data' ? detailAlarm : deviceAlarmView)(e.info.id).then((res) => {
     info.value = toHumpObject(res.data) as any
+    console.log(info.value, 'info.value')
   })
 }
 
@@ -53,13 +59,26 @@
 const $router = useRouter()
 const moreData = () => {
   $router.push({
-    name: 'AlarmCurrentDetail',
+    name: type.value === 'data' ? 'AlarmCurrentDetail' : 'operationAlarmDetail',
     query: {
       id: info.value.id,
       row: JSON.stringify(info.value),
     },
   })
 }
+// 设备详情
+const goDevice = () => {
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
 // 提醒责任人
 const remindRef = ref()
 const remind = () => {
@@ -68,13 +87,18 @@
 // 挂起
 const pendingRef = ref()
 const pending = () => {
-  pendingRef.value.initDialog(info.value)
+  pendingRef.value.initDialog({ ...info.value, type: type.value })
 }
 // 查看流程
 const processRef = ref()
 const viewProcess = () => {
   processRef.value.initDialog(info.value)
 }
+// 报警处置
+const handlerRef = ref()
+const handler = () => {
+  handlerRef.value.initDialog(info.value)
+}
 defineExpose({ initDialog, close })
 </script>
 
@@ -94,7 +118,13 @@
       <span class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备编号:
+        <span style="padding-left: 6px;" class="more" @click="goDevice">
+          {{ info.devcode }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警类别:
         <span style="padding-left: 6px;">
           {{ info.alarmCategory }}
@@ -106,7 +136,13 @@
           {{ info.alarmMsg }}
         </span>
       </div>
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备类型:
+        <span style="padding-left: 6px;">
+          {{ info.devTypeName }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
@@ -164,7 +200,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -176,9 +212,12 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4" size="small" @click="remind">
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
         提醒责任人
       </el-button>
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'device'" size="small" @click="handler">
+        报警处置
+      </el-button>
       <el-button v-if="Number(info.processStatus) <= 3" type="primary" size="small" @click="pending">
         挂起
       </el-button>
@@ -233,14 +272,14 @@
     display: flex;
     justify-content: space-between;
     font-size: 16px;
+  }
 
-    .more {
-      color: #3d7eff;
+  .more {
+    color: #3d7eff;
 
-      &:hover {
-        cursor: pointer;
-        text-decoration: underline;
-      }
+    &:hover {
+      cursor: pointer;
+      text-decoration: underline;
     }
   }
 
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index 6e1b260..a8b44a6 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -46,6 +46,7 @@
     infoWindow: detail.value,
     info: $props.data,
     map: mapRef.value.map,
+    type: 'data',
   })
   setTimeout(() => {
     // mapRef.value.map.setFitView()
@@ -75,6 +76,7 @@
       infoWindow: detail.value,
       info: data,
       map: mapRef.value.map,
+      type: 'data',
     })
     setTimeout(() => {
       // mapRef.value.map.setFitView()
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index df1cd85..dcac82c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -7,6 +7,7 @@
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { pendingAlarm } from '@/api/home/alarm/current'
+import { pendingDeviceAlarm } from '@/api/home/operation/alarm'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -30,11 +31,13 @@
 
 // 初始化对话框
 const data = ref()
+const type = ref('')
 const initDialog = (row: any) => {
   data.value = row
   dialogFormVisible.value = true
   resetForm()
   dataForm.value.alarmId = row.id
+  type.value = row.type
 }
 defineExpose({
   initDialog,
@@ -44,7 +47,7 @@
 const saveData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      pendingAlarm(dataForm.value).then((res) => {
+      (type.value === 'data' ? pendingAlarm : pendingDeviceAlarm)(dataForm.value).then((res) => {
         ElMessage.success('操作成功')
         dialogFormVisible.value = false
         data.value.processStatus = 3

diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts
new file mode 100644
index 0000000..2723ec8
--- /dev/null
+++ b/src/api/home/operation/alarm.ts
@@ -0,0 +1,41 @@
+/**
+ * 设备当前报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceCurrentListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查看
+export function deviceAlarmView(id: any) {
+  return request({
+    url: '/maintenance/alarmRecords/deviceAlarmView',
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+// 挂起
+export function pendingDeviceAlarm(data: any) {
+  return request({
+    url: '/maintenance/alarmRecords/suspend',
+    method: 'post',
+    data,
+  })
+}
+// 批量删除
+export function batchRemoveRow(ids: any) {
+  return request({
+    url: '/maintenance/alarmRecords/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts
new file mode 100644
index 0000000..a26ad3f
--- /dev/null
+++ b/src/api/home/operation/history.ts
@@ -0,0 +1,14 @@
+/**
+ * 设备历史报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceHistoryListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/historyListPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index ed722fb..6f58857 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -355,6 +355,19 @@
         },
       },
       {
+        path: 'alarm/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationAlarmDetail',
+        meta: {
+          title: '设备报警详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/alarm',
+          auth: '/operation/alarm',
+        },
+      },
+      {
         path: 'history',
         component: () => import('@/views/home/operation/history/index.vue'),
         name: 'operationHistory',
@@ -368,6 +381,19 @@
         },
       },
       {
+        path: 'history/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationHistoryDetail',
+        meta: {
+          title: '历史设备报警',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/history',
+          auth: '/operation/history',
+        },
+      },
+      {
         path: 'trajectory',
         component: () => import('@/views/home/operation/trajectory/index.vue'),
         name: 'operationTrajectory',
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 7ac6332..30aa05e 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -9,6 +9,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import processDialog from './processDialog.vue'
 import { detailAlarm } from '@/api/home/alarm/current'
+import { deviceAlarmView } from '@/api/home/operation/alarm'
 import { toHumpObject } from '@/utils/String'
 const dialogFormVisible = ref(false)
 const overlay = ref()
@@ -32,15 +33,20 @@
   processContent: '',
   processStatus: '',
   id: '',
+  type: '',
 })
+const type = ref('')
 const initDialog = (e: any) => {
   console.log(e, '信息窗体接收的数据')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   dialogFormVisible.value = true
-  info.value = e.info
-  detailAlarm(e.info.id).then((res) => {
+  type.value = e.type
+  info.value = e.info;
+
+  (type.value === 'data' ? detailAlarm : deviceAlarmView)(e.info.id).then((res) => {
     info.value = toHumpObject(res.data) as any
+    console.log(info.value, 'info.value')
   })
 }
 
@@ -53,13 +59,26 @@
 const $router = useRouter()
 const moreData = () => {
   $router.push({
-    name: 'AlarmCurrentDetail',
+    name: type.value === 'data' ? 'AlarmCurrentDetail' : 'operationAlarmDetail',
     query: {
       id: info.value.id,
       row: JSON.stringify(info.value),
     },
   })
 }
+// 设备详情
+const goDevice = () => {
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
 // 提醒责任人
 const remindRef = ref()
 const remind = () => {
@@ -68,13 +87,18 @@
 // 挂起
 const pendingRef = ref()
 const pending = () => {
-  pendingRef.value.initDialog(info.value)
+  pendingRef.value.initDialog({ ...info.value, type: type.value })
 }
 // 查看流程
 const processRef = ref()
 const viewProcess = () => {
   processRef.value.initDialog(info.value)
 }
+// 报警处置
+const handlerRef = ref()
+const handler = () => {
+  handlerRef.value.initDialog(info.value)
+}
 defineExpose({ initDialog, close })
 </script>
 
@@ -94,7 +118,13 @@
       <span class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备编号:
+        <span style="padding-left: 6px;" class="more" @click="goDevice">
+          {{ info.devcode }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警类别:
         <span style="padding-left: 6px;">
           {{ info.alarmCategory }}
@@ -106,7 +136,13 @@
           {{ info.alarmMsg }}
         </span>
       </div>
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备类型:
+        <span style="padding-left: 6px;">
+          {{ info.devTypeName }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
@@ -164,7 +200,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -176,9 +212,12 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4" size="small" @click="remind">
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
         提醒责任人
       </el-button>
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'device'" size="small" @click="handler">
+        报警处置
+      </el-button>
       <el-button v-if="Number(info.processStatus) <= 3" type="primary" size="small" @click="pending">
         挂起
       </el-button>
@@ -233,14 +272,14 @@
     display: flex;
     justify-content: space-between;
     font-size: 16px;
+  }
 
-    .more {
-      color: #3d7eff;
+  .more {
+    color: #3d7eff;
 
-      &:hover {
-        cursor: pointer;
-        text-decoration: underline;
-      }
+    &:hover {
+      cursor: pointer;
+      text-decoration: underline;
     }
   }
 
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index 6e1b260..a8b44a6 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -46,6 +46,7 @@
     infoWindow: detail.value,
     info: $props.data,
     map: mapRef.value.map,
+    type: 'data',
   })
   setTimeout(() => {
     // mapRef.value.map.setFitView()
@@ -75,6 +76,7 @@
       infoWindow: detail.value,
       info: data,
       map: mapRef.value.map,
+      type: 'data',
     })
     setTimeout(() => {
       // mapRef.value.map.setFitView()
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index df1cd85..dcac82c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -7,6 +7,7 @@
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { pendingAlarm } from '@/api/home/alarm/current'
+import { pendingDeviceAlarm } from '@/api/home/operation/alarm'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -30,11 +31,13 @@
 
 // 初始化对话框
 const data = ref()
+const type = ref('')
 const initDialog = (row: any) => {
   data.value = row
   dialogFormVisible.value = true
   resetForm()
   dataForm.value.alarmId = row.id
+  type.value = row.type
 }
 defineExpose({
   initDialog,
@@ -44,7 +47,7 @@
 const saveData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      pendingAlarm(dataForm.value).then((res) => {
+      (type.value === 'data' ? pendingAlarm : pendingDeviceAlarm)(dataForm.value).then((res) => {
         ElMessage.success('操作成功')
         dialogFormVisible.value = false
         data.value.processStatus = 3
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index c65a637..b6fcb2d 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -7,12 +7,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-import { batchDelete, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
+import { batchDelete, detailAlarm, getCurrentAlarmListPage } from '@/api/home/alarm/current'
 import { getDictByCode } from '@/api/system/dict'
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
 import { shortcuts } from '@/utils/common'
+import { toHumpObject } from '@/utils/String'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -138,16 +139,16 @@
 // 查看报警
 const mapRef = ref()
 const mapData = ref({})
-const detail = (row: any) => {
+const detail = async (row: any) => {
+  const res = await detailAlarm(row.id)
+  const data = toHumpObject(res.data)
   mapData.value = row
   switchMode('map')
-  row.lngGaode = '116.398043'
-  row.latGaode = '39.901552'
   // 绘制点
   const draw = () => {
     mapRef.value.mapRef.removeMarker()
     mapRef.value.mapRef.addMarker({
-      position: [row.lngGaode, row.latGaode],
+      position: [data.lngGaode, data.latGaode],
       content: '<div class="spread-circle"></div>',
       label: '',
     })
@@ -155,11 +156,11 @@
     mapRef.value.mapRef.map.setZoom(15)
     mapRef.value.openInfoDetail({
       ...row,
-      lnglat: [row.lngGaode, row.latGaode],
+      lnglat: [data.lngGaode, data.latGaode],
     })
   }
   setTimeout(() => {
-    if (!row.lngGaode || !row.latGaode) {
+    if (!data.lngGaode || !data.latGaode) {
       ElMessage.warning('该数据缺少坐标信息')
       return
     }

diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts
new file mode 100644
index 0000000..2723ec8
--- /dev/null
+++ b/src/api/home/operation/alarm.ts
@@ -0,0 +1,41 @@
+/**
+ * 设备当前报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceCurrentListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查看
+export function deviceAlarmView(id: any) {
+  return request({
+    url: '/maintenance/alarmRecords/deviceAlarmView',
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+// 挂起
+export function pendingDeviceAlarm(data: any) {
+  return request({
+    url: '/maintenance/alarmRecords/suspend',
+    method: 'post',
+    data,
+  })
+}
+// 批量删除
+export function batchRemoveRow(ids: any) {
+  return request({
+    url: '/maintenance/alarmRecords/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts
new file mode 100644
index 0000000..a26ad3f
--- /dev/null
+++ b/src/api/home/operation/history.ts
@@ -0,0 +1,14 @@
+/**
+ * 设备历史报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceHistoryListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/historyListPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index ed722fb..6f58857 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -355,6 +355,19 @@
         },
       },
       {
+        path: 'alarm/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationAlarmDetail',
+        meta: {
+          title: '设备报警详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/alarm',
+          auth: '/operation/alarm',
+        },
+      },
+      {
         path: 'history',
         component: () => import('@/views/home/operation/history/index.vue'),
         name: 'operationHistory',
@@ -368,6 +381,19 @@
         },
       },
       {
+        path: 'history/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationHistoryDetail',
+        meta: {
+          title: '历史设备报警',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/history',
+          auth: '/operation/history',
+        },
+      },
+      {
         path: 'trajectory',
         component: () => import('@/views/home/operation/trajectory/index.vue'),
         name: 'operationTrajectory',
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 7ac6332..30aa05e 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -9,6 +9,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import processDialog from './processDialog.vue'
 import { detailAlarm } from '@/api/home/alarm/current'
+import { deviceAlarmView } from '@/api/home/operation/alarm'
 import { toHumpObject } from '@/utils/String'
 const dialogFormVisible = ref(false)
 const overlay = ref()
@@ -32,15 +33,20 @@
   processContent: '',
   processStatus: '',
   id: '',
+  type: '',
 })
+const type = ref('')
 const initDialog = (e: any) => {
   console.log(e, '信息窗体接收的数据')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   dialogFormVisible.value = true
-  info.value = e.info
-  detailAlarm(e.info.id).then((res) => {
+  type.value = e.type
+  info.value = e.info;
+
+  (type.value === 'data' ? detailAlarm : deviceAlarmView)(e.info.id).then((res) => {
     info.value = toHumpObject(res.data) as any
+    console.log(info.value, 'info.value')
   })
 }
 
@@ -53,13 +59,26 @@
 const $router = useRouter()
 const moreData = () => {
   $router.push({
-    name: 'AlarmCurrentDetail',
+    name: type.value === 'data' ? 'AlarmCurrentDetail' : 'operationAlarmDetail',
     query: {
       id: info.value.id,
       row: JSON.stringify(info.value),
     },
   })
 }
+// 设备详情
+const goDevice = () => {
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
 // 提醒责任人
 const remindRef = ref()
 const remind = () => {
@@ -68,13 +87,18 @@
 // 挂起
 const pendingRef = ref()
 const pending = () => {
-  pendingRef.value.initDialog(info.value)
+  pendingRef.value.initDialog({ ...info.value, type: type.value })
 }
 // 查看流程
 const processRef = ref()
 const viewProcess = () => {
   processRef.value.initDialog(info.value)
 }
+// 报警处置
+const handlerRef = ref()
+const handler = () => {
+  handlerRef.value.initDialog(info.value)
+}
 defineExpose({ initDialog, close })
 </script>
 
@@ -94,7 +118,13 @@
       <span class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备编号:
+        <span style="padding-left: 6px;" class="more" @click="goDevice">
+          {{ info.devcode }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警类别:
         <span style="padding-left: 6px;">
           {{ info.alarmCategory }}
@@ -106,7 +136,13 @@
           {{ info.alarmMsg }}
         </span>
       </div>
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备类型:
+        <span style="padding-left: 6px;">
+          {{ info.devTypeName }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
@@ -164,7 +200,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -176,9 +212,12 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4" size="small" @click="remind">
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
         提醒责任人
       </el-button>
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'device'" size="small" @click="handler">
+        报警处置
+      </el-button>
       <el-button v-if="Number(info.processStatus) <= 3" type="primary" size="small" @click="pending">
         挂起
       </el-button>
@@ -233,14 +272,14 @@
     display: flex;
     justify-content: space-between;
     font-size: 16px;
+  }
 
-    .more {
-      color: #3d7eff;
+  .more {
+    color: #3d7eff;
 
-      &:hover {
-        cursor: pointer;
-        text-decoration: underline;
-      }
+    &:hover {
+      cursor: pointer;
+      text-decoration: underline;
     }
   }
 
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index 6e1b260..a8b44a6 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -46,6 +46,7 @@
     infoWindow: detail.value,
     info: $props.data,
     map: mapRef.value.map,
+    type: 'data',
   })
   setTimeout(() => {
     // mapRef.value.map.setFitView()
@@ -75,6 +76,7 @@
       infoWindow: detail.value,
       info: data,
       map: mapRef.value.map,
+      type: 'data',
     })
     setTimeout(() => {
       // mapRef.value.map.setFitView()
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index df1cd85..dcac82c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -7,6 +7,7 @@
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { pendingAlarm } from '@/api/home/alarm/current'
+import { pendingDeviceAlarm } from '@/api/home/operation/alarm'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -30,11 +31,13 @@
 
 // 初始化对话框
 const data = ref()
+const type = ref('')
 const initDialog = (row: any) => {
   data.value = row
   dialogFormVisible.value = true
   resetForm()
   dataForm.value.alarmId = row.id
+  type.value = row.type
 }
 defineExpose({
   initDialog,
@@ -44,7 +47,7 @@
 const saveData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      pendingAlarm(dataForm.value).then((res) => {
+      (type.value === 'data' ? pendingAlarm : pendingDeviceAlarm)(dataForm.value).then((res) => {
         ElMessage.success('操作成功')
         dialogFormVisible.value = false
         data.value.processStatus = 3
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index c65a637..b6fcb2d 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -7,12 +7,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-import { batchDelete, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
+import { batchDelete, detailAlarm, getCurrentAlarmListPage } from '@/api/home/alarm/current'
 import { getDictByCode } from '@/api/system/dict'
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
 import { shortcuts } from '@/utils/common'
+import { toHumpObject } from '@/utils/String'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -138,16 +139,16 @@
 // 查看报警
 const mapRef = ref()
 const mapData = ref({})
-const detail = (row: any) => {
+const detail = async (row: any) => {
+  const res = await detailAlarm(row.id)
+  const data = toHumpObject(res.data)
   mapData.value = row
   switchMode('map')
-  row.lngGaode = '116.398043'
-  row.latGaode = '39.901552'
   // 绘制点
   const draw = () => {
     mapRef.value.mapRef.removeMarker()
     mapRef.value.mapRef.addMarker({
-      position: [row.lngGaode, row.latGaode],
+      position: [data.lngGaode, data.latGaode],
       content: '<div class="spread-circle"></div>',
       label: '',
     })
@@ -155,11 +156,11 @@
     mapRef.value.mapRef.map.setZoom(15)
     mapRef.value.openInfoDetail({
       ...row,
-      lnglat: [row.lngGaode, row.latGaode],
+      lnglat: [data.lngGaode, data.latGaode],
     })
   }
   setTimeout(() => {
-    if (!row.lngGaode || !row.latGaode) {
+    if (!data.lngGaode || !data.latGaode) {
       ElMessage.warning('该数据缺少坐标信息')
       return
     }
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index 3247ac8..1abcb64 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -8,7 +8,7 @@
 import detailData from './detailData.vue'
 import showPosition from './showPosition.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
-import { getDeviceDetail } from '@/api/home/device/device'
+import { getDeviceListPage } from '@/api/home/device/device'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -77,12 +77,17 @@
 // 获取闸井详情数据
 const fetchWellDetail = () => {
   loading.value = true
-  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
-    loading.value = false
-    detailInfo.value = JSON.parse($route.query.row as string)
-    detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
-    detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || ''
-    loading.value = false
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+    }
+    catch (err) {
+      loading.value = false
+    }
   }).catch(() => {
     loading.value = false
   })

diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts
new file mode 100644
index 0000000..2723ec8
--- /dev/null
+++ b/src/api/home/operation/alarm.ts
@@ -0,0 +1,41 @@
+/**
+ * 设备当前报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceCurrentListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查看
+export function deviceAlarmView(id: any) {
+  return request({
+    url: '/maintenance/alarmRecords/deviceAlarmView',
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+// 挂起
+export function pendingDeviceAlarm(data: any) {
+  return request({
+    url: '/maintenance/alarmRecords/suspend',
+    method: 'post',
+    data,
+  })
+}
+// 批量删除
+export function batchRemoveRow(ids: any) {
+  return request({
+    url: '/maintenance/alarmRecords/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts
new file mode 100644
index 0000000..a26ad3f
--- /dev/null
+++ b/src/api/home/operation/history.ts
@@ -0,0 +1,14 @@
+/**
+ * 设备历史报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceHistoryListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/historyListPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index ed722fb..6f58857 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -355,6 +355,19 @@
         },
       },
       {
+        path: 'alarm/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationAlarmDetail',
+        meta: {
+          title: '设备报警详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/alarm',
+          auth: '/operation/alarm',
+        },
+      },
+      {
         path: 'history',
         component: () => import('@/views/home/operation/history/index.vue'),
         name: 'operationHistory',
@@ -368,6 +381,19 @@
         },
       },
       {
+        path: 'history/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationHistoryDetail',
+        meta: {
+          title: '历史设备报警',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/history',
+          auth: '/operation/history',
+        },
+      },
+      {
         path: 'trajectory',
         component: () => import('@/views/home/operation/trajectory/index.vue'),
         name: 'operationTrajectory',
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 7ac6332..30aa05e 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -9,6 +9,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import processDialog from './processDialog.vue'
 import { detailAlarm } from '@/api/home/alarm/current'
+import { deviceAlarmView } from '@/api/home/operation/alarm'
 import { toHumpObject } from '@/utils/String'
 const dialogFormVisible = ref(false)
 const overlay = ref()
@@ -32,15 +33,20 @@
   processContent: '',
   processStatus: '',
   id: '',
+  type: '',
 })
+const type = ref('')
 const initDialog = (e: any) => {
   console.log(e, '信息窗体接收的数据')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   dialogFormVisible.value = true
-  info.value = e.info
-  detailAlarm(e.info.id).then((res) => {
+  type.value = e.type
+  info.value = e.info;
+
+  (type.value === 'data' ? detailAlarm : deviceAlarmView)(e.info.id).then((res) => {
     info.value = toHumpObject(res.data) as any
+    console.log(info.value, 'info.value')
   })
 }
 
@@ -53,13 +59,26 @@
 const $router = useRouter()
 const moreData = () => {
   $router.push({
-    name: 'AlarmCurrentDetail',
+    name: type.value === 'data' ? 'AlarmCurrentDetail' : 'operationAlarmDetail',
     query: {
       id: info.value.id,
       row: JSON.stringify(info.value),
     },
   })
 }
+// 设备详情
+const goDevice = () => {
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
 // 提醒责任人
 const remindRef = ref()
 const remind = () => {
@@ -68,13 +87,18 @@
 // 挂起
 const pendingRef = ref()
 const pending = () => {
-  pendingRef.value.initDialog(info.value)
+  pendingRef.value.initDialog({ ...info.value, type: type.value })
 }
 // 查看流程
 const processRef = ref()
 const viewProcess = () => {
   processRef.value.initDialog(info.value)
 }
+// 报警处置
+const handlerRef = ref()
+const handler = () => {
+  handlerRef.value.initDialog(info.value)
+}
 defineExpose({ initDialog, close })
 </script>
 
@@ -94,7 +118,13 @@
       <span class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备编号:
+        <span style="padding-left: 6px;" class="more" @click="goDevice">
+          {{ info.devcode }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警类别:
         <span style="padding-left: 6px;">
           {{ info.alarmCategory }}
@@ -106,7 +136,13 @@
           {{ info.alarmMsg }}
         </span>
       </div>
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备类型:
+        <span style="padding-left: 6px;">
+          {{ info.devTypeName }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
@@ -164,7 +200,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -176,9 +212,12 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4" size="small" @click="remind">
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
         提醒责任人
       </el-button>
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'device'" size="small" @click="handler">
+        报警处置
+      </el-button>
       <el-button v-if="Number(info.processStatus) <= 3" type="primary" size="small" @click="pending">
         挂起
       </el-button>
@@ -233,14 +272,14 @@
     display: flex;
     justify-content: space-between;
     font-size: 16px;
+  }
 
-    .more {
-      color: #3d7eff;
+  .more {
+    color: #3d7eff;
 
-      &:hover {
-        cursor: pointer;
-        text-decoration: underline;
-      }
+    &:hover {
+      cursor: pointer;
+      text-decoration: underline;
     }
   }
 
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index 6e1b260..a8b44a6 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -46,6 +46,7 @@
     infoWindow: detail.value,
     info: $props.data,
     map: mapRef.value.map,
+    type: 'data',
   })
   setTimeout(() => {
     // mapRef.value.map.setFitView()
@@ -75,6 +76,7 @@
       infoWindow: detail.value,
       info: data,
       map: mapRef.value.map,
+      type: 'data',
     })
     setTimeout(() => {
       // mapRef.value.map.setFitView()
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index df1cd85..dcac82c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -7,6 +7,7 @@
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { pendingAlarm } from '@/api/home/alarm/current'
+import { pendingDeviceAlarm } from '@/api/home/operation/alarm'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -30,11 +31,13 @@
 
 // 初始化对话框
 const data = ref()
+const type = ref('')
 const initDialog = (row: any) => {
   data.value = row
   dialogFormVisible.value = true
   resetForm()
   dataForm.value.alarmId = row.id
+  type.value = row.type
 }
 defineExpose({
   initDialog,
@@ -44,7 +47,7 @@
 const saveData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      pendingAlarm(dataForm.value).then((res) => {
+      (type.value === 'data' ? pendingAlarm : pendingDeviceAlarm)(dataForm.value).then((res) => {
         ElMessage.success('操作成功')
         dialogFormVisible.value = false
         data.value.processStatus = 3
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index c65a637..b6fcb2d 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -7,12 +7,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-import { batchDelete, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
+import { batchDelete, detailAlarm, getCurrentAlarmListPage } from '@/api/home/alarm/current'
 import { getDictByCode } from '@/api/system/dict'
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
 import { shortcuts } from '@/utils/common'
+import { toHumpObject } from '@/utils/String'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -138,16 +139,16 @@
 // 查看报警
 const mapRef = ref()
 const mapData = ref({})
-const detail = (row: any) => {
+const detail = async (row: any) => {
+  const res = await detailAlarm(row.id)
+  const data = toHumpObject(res.data)
   mapData.value = row
   switchMode('map')
-  row.lngGaode = '116.398043'
-  row.latGaode = '39.901552'
   // 绘制点
   const draw = () => {
     mapRef.value.mapRef.removeMarker()
     mapRef.value.mapRef.addMarker({
-      position: [row.lngGaode, row.latGaode],
+      position: [data.lngGaode, data.latGaode],
       content: '<div class="spread-circle"></div>',
       label: '',
     })
@@ -155,11 +156,11 @@
     mapRef.value.mapRef.map.setZoom(15)
     mapRef.value.openInfoDetail({
       ...row,
-      lnglat: [row.lngGaode, row.latGaode],
+      lnglat: [data.lngGaode, data.latGaode],
     })
   }
   setTimeout(() => {
-    if (!row.lngGaode || !row.latGaode) {
+    if (!data.lngGaode || !data.latGaode) {
       ElMessage.warning('该数据缺少坐标信息')
       return
     }
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index 3247ac8..1abcb64 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -8,7 +8,7 @@
 import detailData from './detailData.vue'
 import showPosition from './showPosition.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
-import { getDeviceDetail } from '@/api/home/device/device'
+import { getDeviceListPage } from '@/api/home/device/device'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -77,12 +77,17 @@
 // 获取闸井详情数据
 const fetchWellDetail = () => {
   loading.value = true
-  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
-    loading.value = false
-    detailInfo.value = JSON.parse($route.query.row as string)
-    detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
-    detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || ''
-    loading.value = false
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+    }
+    catch (err) {
+      loading.value = false
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 2b228a0..0b75fd4 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -131,7 +131,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.deviceName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',

diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts
new file mode 100644
index 0000000..2723ec8
--- /dev/null
+++ b/src/api/home/operation/alarm.ts
@@ -0,0 +1,41 @@
+/**
+ * 设备当前报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceCurrentListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查看
+export function deviceAlarmView(id: any) {
+  return request({
+    url: '/maintenance/alarmRecords/deviceAlarmView',
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+// 挂起
+export function pendingDeviceAlarm(data: any) {
+  return request({
+    url: '/maintenance/alarmRecords/suspend',
+    method: 'post',
+    data,
+  })
+}
+// 批量删除
+export function batchRemoveRow(ids: any) {
+  return request({
+    url: '/maintenance/alarmRecords/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts
new file mode 100644
index 0000000..a26ad3f
--- /dev/null
+++ b/src/api/home/operation/history.ts
@@ -0,0 +1,14 @@
+/**
+ * 设备历史报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceHistoryListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/historyListPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index ed722fb..6f58857 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -355,6 +355,19 @@
         },
       },
       {
+        path: 'alarm/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationAlarmDetail',
+        meta: {
+          title: '设备报警详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/alarm',
+          auth: '/operation/alarm',
+        },
+      },
+      {
         path: 'history',
         component: () => import('@/views/home/operation/history/index.vue'),
         name: 'operationHistory',
@@ -368,6 +381,19 @@
         },
       },
       {
+        path: 'history/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationHistoryDetail',
+        meta: {
+          title: '历史设备报警',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/history',
+          auth: '/operation/history',
+        },
+      },
+      {
         path: 'trajectory',
         component: () => import('@/views/home/operation/trajectory/index.vue'),
         name: 'operationTrajectory',
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 7ac6332..30aa05e 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -9,6 +9,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import processDialog from './processDialog.vue'
 import { detailAlarm } from '@/api/home/alarm/current'
+import { deviceAlarmView } from '@/api/home/operation/alarm'
 import { toHumpObject } from '@/utils/String'
 const dialogFormVisible = ref(false)
 const overlay = ref()
@@ -32,15 +33,20 @@
   processContent: '',
   processStatus: '',
   id: '',
+  type: '',
 })
+const type = ref('')
 const initDialog = (e: any) => {
   console.log(e, '信息窗体接收的数据')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   dialogFormVisible.value = true
-  info.value = e.info
-  detailAlarm(e.info.id).then((res) => {
+  type.value = e.type
+  info.value = e.info;
+
+  (type.value === 'data' ? detailAlarm : deviceAlarmView)(e.info.id).then((res) => {
     info.value = toHumpObject(res.data) as any
+    console.log(info.value, 'info.value')
   })
 }
 
@@ -53,13 +59,26 @@
 const $router = useRouter()
 const moreData = () => {
   $router.push({
-    name: 'AlarmCurrentDetail',
+    name: type.value === 'data' ? 'AlarmCurrentDetail' : 'operationAlarmDetail',
     query: {
       id: info.value.id,
       row: JSON.stringify(info.value),
     },
   })
 }
+// 设备详情
+const goDevice = () => {
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
 // 提醒责任人
 const remindRef = ref()
 const remind = () => {
@@ -68,13 +87,18 @@
 // 挂起
 const pendingRef = ref()
 const pending = () => {
-  pendingRef.value.initDialog(info.value)
+  pendingRef.value.initDialog({ ...info.value, type: type.value })
 }
 // 查看流程
 const processRef = ref()
 const viewProcess = () => {
   processRef.value.initDialog(info.value)
 }
+// 报警处置
+const handlerRef = ref()
+const handler = () => {
+  handlerRef.value.initDialog(info.value)
+}
 defineExpose({ initDialog, close })
 </script>
 
@@ -94,7 +118,13 @@
       <span class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备编号:
+        <span style="padding-left: 6px;" class="more" @click="goDevice">
+          {{ info.devcode }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警类别:
         <span style="padding-left: 6px;">
           {{ info.alarmCategory }}
@@ -106,7 +136,13 @@
           {{ info.alarmMsg }}
         </span>
       </div>
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备类型:
+        <span style="padding-left: 6px;">
+          {{ info.devTypeName }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
@@ -164,7 +200,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -176,9 +212,12 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4" size="small" @click="remind">
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
         提醒责任人
       </el-button>
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'device'" size="small" @click="handler">
+        报警处置
+      </el-button>
       <el-button v-if="Number(info.processStatus) <= 3" type="primary" size="small" @click="pending">
         挂起
       </el-button>
@@ -233,14 +272,14 @@
     display: flex;
     justify-content: space-between;
     font-size: 16px;
+  }
 
-    .more {
-      color: #3d7eff;
+  .more {
+    color: #3d7eff;
 
-      &:hover {
-        cursor: pointer;
-        text-decoration: underline;
-      }
+    &:hover {
+      cursor: pointer;
+      text-decoration: underline;
     }
   }
 
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index 6e1b260..a8b44a6 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -46,6 +46,7 @@
     infoWindow: detail.value,
     info: $props.data,
     map: mapRef.value.map,
+    type: 'data',
   })
   setTimeout(() => {
     // mapRef.value.map.setFitView()
@@ -75,6 +76,7 @@
       infoWindow: detail.value,
       info: data,
       map: mapRef.value.map,
+      type: 'data',
     })
     setTimeout(() => {
       // mapRef.value.map.setFitView()
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index df1cd85..dcac82c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -7,6 +7,7 @@
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { pendingAlarm } from '@/api/home/alarm/current'
+import { pendingDeviceAlarm } from '@/api/home/operation/alarm'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -30,11 +31,13 @@
 
 // 初始化对话框
 const data = ref()
+const type = ref('')
 const initDialog = (row: any) => {
   data.value = row
   dialogFormVisible.value = true
   resetForm()
   dataForm.value.alarmId = row.id
+  type.value = row.type
 }
 defineExpose({
   initDialog,
@@ -44,7 +47,7 @@
 const saveData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      pendingAlarm(dataForm.value).then((res) => {
+      (type.value === 'data' ? pendingAlarm : pendingDeviceAlarm)(dataForm.value).then((res) => {
         ElMessage.success('操作成功')
         dialogFormVisible.value = false
         data.value.processStatus = 3
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index c65a637..b6fcb2d 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -7,12 +7,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-import { batchDelete, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
+import { batchDelete, detailAlarm, getCurrentAlarmListPage } from '@/api/home/alarm/current'
 import { getDictByCode } from '@/api/system/dict'
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
 import { shortcuts } from '@/utils/common'
+import { toHumpObject } from '@/utils/String'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -138,16 +139,16 @@
 // 查看报警
 const mapRef = ref()
 const mapData = ref({})
-const detail = (row: any) => {
+const detail = async (row: any) => {
+  const res = await detailAlarm(row.id)
+  const data = toHumpObject(res.data)
   mapData.value = row
   switchMode('map')
-  row.lngGaode = '116.398043'
-  row.latGaode = '39.901552'
   // 绘制点
   const draw = () => {
     mapRef.value.mapRef.removeMarker()
     mapRef.value.mapRef.addMarker({
-      position: [row.lngGaode, row.latGaode],
+      position: [data.lngGaode, data.latGaode],
       content: '<div class="spread-circle"></div>',
       label: '',
     })
@@ -155,11 +156,11 @@
     mapRef.value.mapRef.map.setZoom(15)
     mapRef.value.openInfoDetail({
       ...row,
-      lnglat: [row.lngGaode, row.latGaode],
+      lnglat: [data.lngGaode, data.latGaode],
     })
   }
   setTimeout(() => {
-    if (!row.lngGaode || !row.latGaode) {
+    if (!data.lngGaode || !data.latGaode) {
       ElMessage.warning('该数据缺少坐标信息')
       return
     }
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index 3247ac8..1abcb64 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -8,7 +8,7 @@
 import detailData from './detailData.vue'
 import showPosition from './showPosition.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
-import { getDeviceDetail } from '@/api/home/device/device'
+import { getDeviceListPage } from '@/api/home/device/device'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -77,12 +77,17 @@
 // 获取闸井详情数据
 const fetchWellDetail = () => {
   loading.value = true
-  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
-    loading.value = false
-    detailInfo.value = JSON.parse($route.query.row as string)
-    detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
-    detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || ''
-    loading.value = false
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+    }
+    catch (err) {
+      loading.value = false
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 2b228a0..0b75fd4 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -131,7 +131,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.deviceName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 52e035f..799fc90 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -81,7 +81,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.productName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',

diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts
new file mode 100644
index 0000000..2723ec8
--- /dev/null
+++ b/src/api/home/operation/alarm.ts
@@ -0,0 +1,41 @@
+/**
+ * 设备当前报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceCurrentListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查看
+export function deviceAlarmView(id: any) {
+  return request({
+    url: '/maintenance/alarmRecords/deviceAlarmView',
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+// 挂起
+export function pendingDeviceAlarm(data: any) {
+  return request({
+    url: '/maintenance/alarmRecords/suspend',
+    method: 'post',
+    data,
+  })
+}
+// 批量删除
+export function batchRemoveRow(ids: any) {
+  return request({
+    url: '/maintenance/alarmRecords/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts
new file mode 100644
index 0000000..a26ad3f
--- /dev/null
+++ b/src/api/home/operation/history.ts
@@ -0,0 +1,14 @@
+/**
+ * 设备历史报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceHistoryListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/historyListPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index ed722fb..6f58857 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -355,6 +355,19 @@
         },
       },
       {
+        path: 'alarm/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationAlarmDetail',
+        meta: {
+          title: '设备报警详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/alarm',
+          auth: '/operation/alarm',
+        },
+      },
+      {
         path: 'history',
         component: () => import('@/views/home/operation/history/index.vue'),
         name: 'operationHistory',
@@ -368,6 +381,19 @@
         },
       },
       {
+        path: 'history/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationHistoryDetail',
+        meta: {
+          title: '历史设备报警',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/history',
+          auth: '/operation/history',
+        },
+      },
+      {
         path: 'trajectory',
         component: () => import('@/views/home/operation/trajectory/index.vue'),
         name: 'operationTrajectory',
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 7ac6332..30aa05e 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -9,6 +9,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import processDialog from './processDialog.vue'
 import { detailAlarm } from '@/api/home/alarm/current'
+import { deviceAlarmView } from '@/api/home/operation/alarm'
 import { toHumpObject } from '@/utils/String'
 const dialogFormVisible = ref(false)
 const overlay = ref()
@@ -32,15 +33,20 @@
   processContent: '',
   processStatus: '',
   id: '',
+  type: '',
 })
+const type = ref('')
 const initDialog = (e: any) => {
   console.log(e, '信息窗体接收的数据')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   dialogFormVisible.value = true
-  info.value = e.info
-  detailAlarm(e.info.id).then((res) => {
+  type.value = e.type
+  info.value = e.info;
+
+  (type.value === 'data' ? detailAlarm : deviceAlarmView)(e.info.id).then((res) => {
     info.value = toHumpObject(res.data) as any
+    console.log(info.value, 'info.value')
   })
 }
 
@@ -53,13 +59,26 @@
 const $router = useRouter()
 const moreData = () => {
   $router.push({
-    name: 'AlarmCurrentDetail',
+    name: type.value === 'data' ? 'AlarmCurrentDetail' : 'operationAlarmDetail',
     query: {
       id: info.value.id,
       row: JSON.stringify(info.value),
     },
   })
 }
+// 设备详情
+const goDevice = () => {
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
 // 提醒责任人
 const remindRef = ref()
 const remind = () => {
@@ -68,13 +87,18 @@
 // 挂起
 const pendingRef = ref()
 const pending = () => {
-  pendingRef.value.initDialog(info.value)
+  pendingRef.value.initDialog({ ...info.value, type: type.value })
 }
 // 查看流程
 const processRef = ref()
 const viewProcess = () => {
   processRef.value.initDialog(info.value)
 }
+// 报警处置
+const handlerRef = ref()
+const handler = () => {
+  handlerRef.value.initDialog(info.value)
+}
 defineExpose({ initDialog, close })
 </script>
 
@@ -94,7 +118,13 @@
       <span class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备编号:
+        <span style="padding-left: 6px;" class="more" @click="goDevice">
+          {{ info.devcode }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警类别:
         <span style="padding-left: 6px;">
           {{ info.alarmCategory }}
@@ -106,7 +136,13 @@
           {{ info.alarmMsg }}
         </span>
       </div>
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备类型:
+        <span style="padding-left: 6px;">
+          {{ info.devTypeName }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
@@ -164,7 +200,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -176,9 +212,12 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4" size="small" @click="remind">
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
         提醒责任人
       </el-button>
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'device'" size="small" @click="handler">
+        报警处置
+      </el-button>
       <el-button v-if="Number(info.processStatus) <= 3" type="primary" size="small" @click="pending">
         挂起
       </el-button>
@@ -233,14 +272,14 @@
     display: flex;
     justify-content: space-between;
     font-size: 16px;
+  }
 
-    .more {
-      color: #3d7eff;
+  .more {
+    color: #3d7eff;
 
-      &:hover {
-        cursor: pointer;
-        text-decoration: underline;
-      }
+    &:hover {
+      cursor: pointer;
+      text-decoration: underline;
     }
   }
 
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index 6e1b260..a8b44a6 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -46,6 +46,7 @@
     infoWindow: detail.value,
     info: $props.data,
     map: mapRef.value.map,
+    type: 'data',
   })
   setTimeout(() => {
     // mapRef.value.map.setFitView()
@@ -75,6 +76,7 @@
       infoWindow: detail.value,
       info: data,
       map: mapRef.value.map,
+      type: 'data',
     })
     setTimeout(() => {
       // mapRef.value.map.setFitView()
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index df1cd85..dcac82c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -7,6 +7,7 @@
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { pendingAlarm } from '@/api/home/alarm/current'
+import { pendingDeviceAlarm } from '@/api/home/operation/alarm'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -30,11 +31,13 @@
 
 // 初始化对话框
 const data = ref()
+const type = ref('')
 const initDialog = (row: any) => {
   data.value = row
   dialogFormVisible.value = true
   resetForm()
   dataForm.value.alarmId = row.id
+  type.value = row.type
 }
 defineExpose({
   initDialog,
@@ -44,7 +47,7 @@
 const saveData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      pendingAlarm(dataForm.value).then((res) => {
+      (type.value === 'data' ? pendingAlarm : pendingDeviceAlarm)(dataForm.value).then((res) => {
         ElMessage.success('操作成功')
         dialogFormVisible.value = false
         data.value.processStatus = 3
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index c65a637..b6fcb2d 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -7,12 +7,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-import { batchDelete, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
+import { batchDelete, detailAlarm, getCurrentAlarmListPage } from '@/api/home/alarm/current'
 import { getDictByCode } from '@/api/system/dict'
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
 import { shortcuts } from '@/utils/common'
+import { toHumpObject } from '@/utils/String'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -138,16 +139,16 @@
 // 查看报警
 const mapRef = ref()
 const mapData = ref({})
-const detail = (row: any) => {
+const detail = async (row: any) => {
+  const res = await detailAlarm(row.id)
+  const data = toHumpObject(res.data)
   mapData.value = row
   switchMode('map')
-  row.lngGaode = '116.398043'
-  row.latGaode = '39.901552'
   // 绘制点
   const draw = () => {
     mapRef.value.mapRef.removeMarker()
     mapRef.value.mapRef.addMarker({
-      position: [row.lngGaode, row.latGaode],
+      position: [data.lngGaode, data.latGaode],
       content: '<div class="spread-circle"></div>',
       label: '',
     })
@@ -155,11 +156,11 @@
     mapRef.value.mapRef.map.setZoom(15)
     mapRef.value.openInfoDetail({
       ...row,
-      lnglat: [row.lngGaode, row.latGaode],
+      lnglat: [data.lngGaode, data.latGaode],
     })
   }
   setTimeout(() => {
-    if (!row.lngGaode || !row.latGaode) {
+    if (!data.lngGaode || !data.latGaode) {
       ElMessage.warning('该数据缺少坐标信息')
       return
     }
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index 3247ac8..1abcb64 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -8,7 +8,7 @@
 import detailData from './detailData.vue'
 import showPosition from './showPosition.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
-import { getDeviceDetail } from '@/api/home/device/device'
+import { getDeviceListPage } from '@/api/home/device/device'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -77,12 +77,17 @@
 // 获取闸井详情数据
 const fetchWellDetail = () => {
   loading.value = true
-  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
-    loading.value = false
-    detailInfo.value = JSON.parse($route.query.row as string)
-    detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
-    detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || ''
-    loading.value = false
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+    }
+    catch (err) {
+      loading.value = false
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 2b228a0..0b75fd4 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -131,7 +131,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.deviceName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 52e035f..799fc90 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -81,7 +81,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.productName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 7df5933..59f1343 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -75,7 +75,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.typeName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',

diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts
new file mode 100644
index 0000000..2723ec8
--- /dev/null
+++ b/src/api/home/operation/alarm.ts
@@ -0,0 +1,41 @@
+/**
+ * 设备当前报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceCurrentListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查看
+export function deviceAlarmView(id: any) {
+  return request({
+    url: '/maintenance/alarmRecords/deviceAlarmView',
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+// 挂起
+export function pendingDeviceAlarm(data: any) {
+  return request({
+    url: '/maintenance/alarmRecords/suspend',
+    method: 'post',
+    data,
+  })
+}
+// 批量删除
+export function batchRemoveRow(ids: any) {
+  return request({
+    url: '/maintenance/alarmRecords/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts
new file mode 100644
index 0000000..a26ad3f
--- /dev/null
+++ b/src/api/home/operation/history.ts
@@ -0,0 +1,14 @@
+/**
+ * 设备历史报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceHistoryListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/historyListPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index ed722fb..6f58857 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -355,6 +355,19 @@
         },
       },
       {
+        path: 'alarm/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationAlarmDetail',
+        meta: {
+          title: '设备报警详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/alarm',
+          auth: '/operation/alarm',
+        },
+      },
+      {
         path: 'history',
         component: () => import('@/views/home/operation/history/index.vue'),
         name: 'operationHistory',
@@ -368,6 +381,19 @@
         },
       },
       {
+        path: 'history/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationHistoryDetail',
+        meta: {
+          title: '历史设备报警',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/history',
+          auth: '/operation/history',
+        },
+      },
+      {
         path: 'trajectory',
         component: () => import('@/views/home/operation/trajectory/index.vue'),
         name: 'operationTrajectory',
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 7ac6332..30aa05e 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -9,6 +9,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import processDialog from './processDialog.vue'
 import { detailAlarm } from '@/api/home/alarm/current'
+import { deviceAlarmView } from '@/api/home/operation/alarm'
 import { toHumpObject } from '@/utils/String'
 const dialogFormVisible = ref(false)
 const overlay = ref()
@@ -32,15 +33,20 @@
   processContent: '',
   processStatus: '',
   id: '',
+  type: '',
 })
+const type = ref('')
 const initDialog = (e: any) => {
   console.log(e, '信息窗体接收的数据')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   dialogFormVisible.value = true
-  info.value = e.info
-  detailAlarm(e.info.id).then((res) => {
+  type.value = e.type
+  info.value = e.info;
+
+  (type.value === 'data' ? detailAlarm : deviceAlarmView)(e.info.id).then((res) => {
     info.value = toHumpObject(res.data) as any
+    console.log(info.value, 'info.value')
   })
 }
 
@@ -53,13 +59,26 @@
 const $router = useRouter()
 const moreData = () => {
   $router.push({
-    name: 'AlarmCurrentDetail',
+    name: type.value === 'data' ? 'AlarmCurrentDetail' : 'operationAlarmDetail',
     query: {
       id: info.value.id,
       row: JSON.stringify(info.value),
     },
   })
 }
+// 设备详情
+const goDevice = () => {
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
 // 提醒责任人
 const remindRef = ref()
 const remind = () => {
@@ -68,13 +87,18 @@
 // 挂起
 const pendingRef = ref()
 const pending = () => {
-  pendingRef.value.initDialog(info.value)
+  pendingRef.value.initDialog({ ...info.value, type: type.value })
 }
 // 查看流程
 const processRef = ref()
 const viewProcess = () => {
   processRef.value.initDialog(info.value)
 }
+// 报警处置
+const handlerRef = ref()
+const handler = () => {
+  handlerRef.value.initDialog(info.value)
+}
 defineExpose({ initDialog, close })
 </script>
 
@@ -94,7 +118,13 @@
       <span class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备编号:
+        <span style="padding-left: 6px;" class="more" @click="goDevice">
+          {{ info.devcode }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警类别:
         <span style="padding-left: 6px;">
           {{ info.alarmCategory }}
@@ -106,7 +136,13 @@
           {{ info.alarmMsg }}
         </span>
       </div>
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备类型:
+        <span style="padding-left: 6px;">
+          {{ info.devTypeName }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
@@ -164,7 +200,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -176,9 +212,12 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4" size="small" @click="remind">
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
         提醒责任人
       </el-button>
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'device'" size="small" @click="handler">
+        报警处置
+      </el-button>
       <el-button v-if="Number(info.processStatus) <= 3" type="primary" size="small" @click="pending">
         挂起
       </el-button>
@@ -233,14 +272,14 @@
     display: flex;
     justify-content: space-between;
     font-size: 16px;
+  }
 
-    .more {
-      color: #3d7eff;
+  .more {
+    color: #3d7eff;
 
-      &:hover {
-        cursor: pointer;
-        text-decoration: underline;
-      }
+    &:hover {
+      cursor: pointer;
+      text-decoration: underline;
     }
   }
 
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index 6e1b260..a8b44a6 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -46,6 +46,7 @@
     infoWindow: detail.value,
     info: $props.data,
     map: mapRef.value.map,
+    type: 'data',
   })
   setTimeout(() => {
     // mapRef.value.map.setFitView()
@@ -75,6 +76,7 @@
       infoWindow: detail.value,
       info: data,
       map: mapRef.value.map,
+      type: 'data',
     })
     setTimeout(() => {
       // mapRef.value.map.setFitView()
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index df1cd85..dcac82c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -7,6 +7,7 @@
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { pendingAlarm } from '@/api/home/alarm/current'
+import { pendingDeviceAlarm } from '@/api/home/operation/alarm'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -30,11 +31,13 @@
 
 // 初始化对话框
 const data = ref()
+const type = ref('')
 const initDialog = (row: any) => {
   data.value = row
   dialogFormVisible.value = true
   resetForm()
   dataForm.value.alarmId = row.id
+  type.value = row.type
 }
 defineExpose({
   initDialog,
@@ -44,7 +47,7 @@
 const saveData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      pendingAlarm(dataForm.value).then((res) => {
+      (type.value === 'data' ? pendingAlarm : pendingDeviceAlarm)(dataForm.value).then((res) => {
         ElMessage.success('操作成功')
         dialogFormVisible.value = false
         data.value.processStatus = 3
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index c65a637..b6fcb2d 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -7,12 +7,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-import { batchDelete, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
+import { batchDelete, detailAlarm, getCurrentAlarmListPage } from '@/api/home/alarm/current'
 import { getDictByCode } from '@/api/system/dict'
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
 import { shortcuts } from '@/utils/common'
+import { toHumpObject } from '@/utils/String'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -138,16 +139,16 @@
 // 查看报警
 const mapRef = ref()
 const mapData = ref({})
-const detail = (row: any) => {
+const detail = async (row: any) => {
+  const res = await detailAlarm(row.id)
+  const data = toHumpObject(res.data)
   mapData.value = row
   switchMode('map')
-  row.lngGaode = '116.398043'
-  row.latGaode = '39.901552'
   // 绘制点
   const draw = () => {
     mapRef.value.mapRef.removeMarker()
     mapRef.value.mapRef.addMarker({
-      position: [row.lngGaode, row.latGaode],
+      position: [data.lngGaode, data.latGaode],
       content: '<div class="spread-circle"></div>',
       label: '',
     })
@@ -155,11 +156,11 @@
     mapRef.value.mapRef.map.setZoom(15)
     mapRef.value.openInfoDetail({
       ...row,
-      lnglat: [row.lngGaode, row.latGaode],
+      lnglat: [data.lngGaode, data.latGaode],
     })
   }
   setTimeout(() => {
-    if (!row.lngGaode || !row.latGaode) {
+    if (!data.lngGaode || !data.latGaode) {
       ElMessage.warning('该数据缺少坐标信息')
       return
     }
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index 3247ac8..1abcb64 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -8,7 +8,7 @@
 import detailData from './detailData.vue'
 import showPosition from './showPosition.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
-import { getDeviceDetail } from '@/api/home/device/device'
+import { getDeviceListPage } from '@/api/home/device/device'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -77,12 +77,17 @@
 // 获取闸井详情数据
 const fetchWellDetail = () => {
   loading.value = true
-  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
-    loading.value = false
-    detailInfo.value = JSON.parse($route.query.row as string)
-    detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
-    detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || ''
-    loading.value = false
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+    }
+    catch (err) {
+      loading.value = false
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 2b228a0..0b75fd4 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -131,7 +131,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.deviceName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 52e035f..799fc90 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -81,7 +81,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.productName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 7df5933..59f1343 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -75,7 +75,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.typeName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index d56a41c..91ad1ca 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -90,7 +90,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.pipeCode}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',

diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts
new file mode 100644
index 0000000..2723ec8
--- /dev/null
+++ b/src/api/home/operation/alarm.ts
@@ -0,0 +1,41 @@
+/**
+ * 设备当前报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceCurrentListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查看
+export function deviceAlarmView(id: any) {
+  return request({
+    url: '/maintenance/alarmRecords/deviceAlarmView',
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+// 挂起
+export function pendingDeviceAlarm(data: any) {
+  return request({
+    url: '/maintenance/alarmRecords/suspend',
+    method: 'post',
+    data,
+  })
+}
+// 批量删除
+export function batchRemoveRow(ids: any) {
+  return request({
+    url: '/maintenance/alarmRecords/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts
new file mode 100644
index 0000000..a26ad3f
--- /dev/null
+++ b/src/api/home/operation/history.ts
@@ -0,0 +1,14 @@
+/**
+ * 设备历史报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceHistoryListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/historyListPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index ed722fb..6f58857 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -355,6 +355,19 @@
         },
       },
       {
+        path: 'alarm/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationAlarmDetail',
+        meta: {
+          title: '设备报警详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/alarm',
+          auth: '/operation/alarm',
+        },
+      },
+      {
         path: 'history',
         component: () => import('@/views/home/operation/history/index.vue'),
         name: 'operationHistory',
@@ -368,6 +381,19 @@
         },
       },
       {
+        path: 'history/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationHistoryDetail',
+        meta: {
+          title: '历史设备报警',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/history',
+          auth: '/operation/history',
+        },
+      },
+      {
         path: 'trajectory',
         component: () => import('@/views/home/operation/trajectory/index.vue'),
         name: 'operationTrajectory',
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 7ac6332..30aa05e 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -9,6 +9,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import processDialog from './processDialog.vue'
 import { detailAlarm } from '@/api/home/alarm/current'
+import { deviceAlarmView } from '@/api/home/operation/alarm'
 import { toHumpObject } from '@/utils/String'
 const dialogFormVisible = ref(false)
 const overlay = ref()
@@ -32,15 +33,20 @@
   processContent: '',
   processStatus: '',
   id: '',
+  type: '',
 })
+const type = ref('')
 const initDialog = (e: any) => {
   console.log(e, '信息窗体接收的数据')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   dialogFormVisible.value = true
-  info.value = e.info
-  detailAlarm(e.info.id).then((res) => {
+  type.value = e.type
+  info.value = e.info;
+
+  (type.value === 'data' ? detailAlarm : deviceAlarmView)(e.info.id).then((res) => {
     info.value = toHumpObject(res.data) as any
+    console.log(info.value, 'info.value')
   })
 }
 
@@ -53,13 +59,26 @@
 const $router = useRouter()
 const moreData = () => {
   $router.push({
-    name: 'AlarmCurrentDetail',
+    name: type.value === 'data' ? 'AlarmCurrentDetail' : 'operationAlarmDetail',
     query: {
       id: info.value.id,
       row: JSON.stringify(info.value),
     },
   })
 }
+// 设备详情
+const goDevice = () => {
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
 // 提醒责任人
 const remindRef = ref()
 const remind = () => {
@@ -68,13 +87,18 @@
 // 挂起
 const pendingRef = ref()
 const pending = () => {
-  pendingRef.value.initDialog(info.value)
+  pendingRef.value.initDialog({ ...info.value, type: type.value })
 }
 // 查看流程
 const processRef = ref()
 const viewProcess = () => {
   processRef.value.initDialog(info.value)
 }
+// 报警处置
+const handlerRef = ref()
+const handler = () => {
+  handlerRef.value.initDialog(info.value)
+}
 defineExpose({ initDialog, close })
 </script>
 
@@ -94,7 +118,13 @@
       <span class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备编号:
+        <span style="padding-left: 6px;" class="more" @click="goDevice">
+          {{ info.devcode }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警类别:
         <span style="padding-left: 6px;">
           {{ info.alarmCategory }}
@@ -106,7 +136,13 @@
           {{ info.alarmMsg }}
         </span>
       </div>
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备类型:
+        <span style="padding-left: 6px;">
+          {{ info.devTypeName }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
@@ -164,7 +200,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -176,9 +212,12 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4" size="small" @click="remind">
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
         提醒责任人
       </el-button>
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'device'" size="small" @click="handler">
+        报警处置
+      </el-button>
       <el-button v-if="Number(info.processStatus) <= 3" type="primary" size="small" @click="pending">
         挂起
       </el-button>
@@ -233,14 +272,14 @@
     display: flex;
     justify-content: space-between;
     font-size: 16px;
+  }
 
-    .more {
-      color: #3d7eff;
+  .more {
+    color: #3d7eff;
 
-      &:hover {
-        cursor: pointer;
-        text-decoration: underline;
-      }
+    &:hover {
+      cursor: pointer;
+      text-decoration: underline;
     }
   }
 
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index 6e1b260..a8b44a6 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -46,6 +46,7 @@
     infoWindow: detail.value,
     info: $props.data,
     map: mapRef.value.map,
+    type: 'data',
   })
   setTimeout(() => {
     // mapRef.value.map.setFitView()
@@ -75,6 +76,7 @@
       infoWindow: detail.value,
       info: data,
       map: mapRef.value.map,
+      type: 'data',
     })
     setTimeout(() => {
       // mapRef.value.map.setFitView()
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index df1cd85..dcac82c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -7,6 +7,7 @@
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { pendingAlarm } from '@/api/home/alarm/current'
+import { pendingDeviceAlarm } from '@/api/home/operation/alarm'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -30,11 +31,13 @@
 
 // 初始化对话框
 const data = ref()
+const type = ref('')
 const initDialog = (row: any) => {
   data.value = row
   dialogFormVisible.value = true
   resetForm()
   dataForm.value.alarmId = row.id
+  type.value = row.type
 }
 defineExpose({
   initDialog,
@@ -44,7 +47,7 @@
 const saveData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      pendingAlarm(dataForm.value).then((res) => {
+      (type.value === 'data' ? pendingAlarm : pendingDeviceAlarm)(dataForm.value).then((res) => {
         ElMessage.success('操作成功')
         dialogFormVisible.value = false
         data.value.processStatus = 3
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index c65a637..b6fcb2d 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -7,12 +7,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-import { batchDelete, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
+import { batchDelete, detailAlarm, getCurrentAlarmListPage } from '@/api/home/alarm/current'
 import { getDictByCode } from '@/api/system/dict'
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
 import { shortcuts } from '@/utils/common'
+import { toHumpObject } from '@/utils/String'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -138,16 +139,16 @@
 // 查看报警
 const mapRef = ref()
 const mapData = ref({})
-const detail = (row: any) => {
+const detail = async (row: any) => {
+  const res = await detailAlarm(row.id)
+  const data = toHumpObject(res.data)
   mapData.value = row
   switchMode('map')
-  row.lngGaode = '116.398043'
-  row.latGaode = '39.901552'
   // 绘制点
   const draw = () => {
     mapRef.value.mapRef.removeMarker()
     mapRef.value.mapRef.addMarker({
-      position: [row.lngGaode, row.latGaode],
+      position: [data.lngGaode, data.latGaode],
       content: '<div class="spread-circle"></div>',
       label: '',
     })
@@ -155,11 +156,11 @@
     mapRef.value.mapRef.map.setZoom(15)
     mapRef.value.openInfoDetail({
       ...row,
-      lnglat: [row.lngGaode, row.latGaode],
+      lnglat: [data.lngGaode, data.latGaode],
     })
   }
   setTimeout(() => {
-    if (!row.lngGaode || !row.latGaode) {
+    if (!data.lngGaode || !data.latGaode) {
       ElMessage.warning('该数据缺少坐标信息')
       return
     }
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index 3247ac8..1abcb64 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -8,7 +8,7 @@
 import detailData from './detailData.vue'
 import showPosition from './showPosition.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
-import { getDeviceDetail } from '@/api/home/device/device'
+import { getDeviceListPage } from '@/api/home/device/device'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -77,12 +77,17 @@
 // 获取闸井详情数据
 const fetchWellDetail = () => {
   loading.value = true
-  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
-    loading.value = false
-    detailInfo.value = JSON.parse($route.query.row as string)
-    detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
-    detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || ''
-    loading.value = false
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+    }
+    catch (err) {
+      loading.value = false
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 2b228a0..0b75fd4 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -131,7 +131,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.deviceName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 52e035f..799fc90 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -81,7 +81,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.productName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 7df5933..59f1343 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -75,7 +75,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.typeName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index d56a41c..91ad1ca 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -90,7 +90,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.pipeCode}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 688e419..54a3218 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -81,7 +81,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.name}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',

diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts
new file mode 100644
index 0000000..2723ec8
--- /dev/null
+++ b/src/api/home/operation/alarm.ts
@@ -0,0 +1,41 @@
+/**
+ * 设备当前报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceCurrentListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查看
+export function deviceAlarmView(id: any) {
+  return request({
+    url: '/maintenance/alarmRecords/deviceAlarmView',
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+// 挂起
+export function pendingDeviceAlarm(data: any) {
+  return request({
+    url: '/maintenance/alarmRecords/suspend',
+    method: 'post',
+    data,
+  })
+}
+// 批量删除
+export function batchRemoveRow(ids: any) {
+  return request({
+    url: '/maintenance/alarmRecords/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts
new file mode 100644
index 0000000..a26ad3f
--- /dev/null
+++ b/src/api/home/operation/history.ts
@@ -0,0 +1,14 @@
+/**
+ * 设备历史报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceHistoryListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/historyListPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index ed722fb..6f58857 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -355,6 +355,19 @@
         },
       },
       {
+        path: 'alarm/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationAlarmDetail',
+        meta: {
+          title: '设备报警详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/alarm',
+          auth: '/operation/alarm',
+        },
+      },
+      {
         path: 'history',
         component: () => import('@/views/home/operation/history/index.vue'),
         name: 'operationHistory',
@@ -368,6 +381,19 @@
         },
       },
       {
+        path: 'history/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationHistoryDetail',
+        meta: {
+          title: '历史设备报警',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/history',
+          auth: '/operation/history',
+        },
+      },
+      {
         path: 'trajectory',
         component: () => import('@/views/home/operation/trajectory/index.vue'),
         name: 'operationTrajectory',
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 7ac6332..30aa05e 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -9,6 +9,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import processDialog from './processDialog.vue'
 import { detailAlarm } from '@/api/home/alarm/current'
+import { deviceAlarmView } from '@/api/home/operation/alarm'
 import { toHumpObject } from '@/utils/String'
 const dialogFormVisible = ref(false)
 const overlay = ref()
@@ -32,15 +33,20 @@
   processContent: '',
   processStatus: '',
   id: '',
+  type: '',
 })
+const type = ref('')
 const initDialog = (e: any) => {
   console.log(e, '信息窗体接收的数据')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   dialogFormVisible.value = true
-  info.value = e.info
-  detailAlarm(e.info.id).then((res) => {
+  type.value = e.type
+  info.value = e.info;
+
+  (type.value === 'data' ? detailAlarm : deviceAlarmView)(e.info.id).then((res) => {
     info.value = toHumpObject(res.data) as any
+    console.log(info.value, 'info.value')
   })
 }
 
@@ -53,13 +59,26 @@
 const $router = useRouter()
 const moreData = () => {
   $router.push({
-    name: 'AlarmCurrentDetail',
+    name: type.value === 'data' ? 'AlarmCurrentDetail' : 'operationAlarmDetail',
     query: {
       id: info.value.id,
       row: JSON.stringify(info.value),
     },
   })
 }
+// 设备详情
+const goDevice = () => {
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
 // 提醒责任人
 const remindRef = ref()
 const remind = () => {
@@ -68,13 +87,18 @@
 // 挂起
 const pendingRef = ref()
 const pending = () => {
-  pendingRef.value.initDialog(info.value)
+  pendingRef.value.initDialog({ ...info.value, type: type.value })
 }
 // 查看流程
 const processRef = ref()
 const viewProcess = () => {
   processRef.value.initDialog(info.value)
 }
+// 报警处置
+const handlerRef = ref()
+const handler = () => {
+  handlerRef.value.initDialog(info.value)
+}
 defineExpose({ initDialog, close })
 </script>
 
@@ -94,7 +118,13 @@
       <span class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备编号:
+        <span style="padding-left: 6px;" class="more" @click="goDevice">
+          {{ info.devcode }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警类别:
         <span style="padding-left: 6px;">
           {{ info.alarmCategory }}
@@ -106,7 +136,13 @@
           {{ info.alarmMsg }}
         </span>
       </div>
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备类型:
+        <span style="padding-left: 6px;">
+          {{ info.devTypeName }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
@@ -164,7 +200,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -176,9 +212,12 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4" size="small" @click="remind">
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
         提醒责任人
       </el-button>
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'device'" size="small" @click="handler">
+        报警处置
+      </el-button>
       <el-button v-if="Number(info.processStatus) <= 3" type="primary" size="small" @click="pending">
         挂起
       </el-button>
@@ -233,14 +272,14 @@
     display: flex;
     justify-content: space-between;
     font-size: 16px;
+  }
 
-    .more {
-      color: #3d7eff;
+  .more {
+    color: #3d7eff;
 
-      &:hover {
-        cursor: pointer;
-        text-decoration: underline;
-      }
+    &:hover {
+      cursor: pointer;
+      text-decoration: underline;
     }
   }
 
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index 6e1b260..a8b44a6 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -46,6 +46,7 @@
     infoWindow: detail.value,
     info: $props.data,
     map: mapRef.value.map,
+    type: 'data',
   })
   setTimeout(() => {
     // mapRef.value.map.setFitView()
@@ -75,6 +76,7 @@
       infoWindow: detail.value,
       info: data,
       map: mapRef.value.map,
+      type: 'data',
     })
     setTimeout(() => {
       // mapRef.value.map.setFitView()
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index df1cd85..dcac82c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -7,6 +7,7 @@
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { pendingAlarm } from '@/api/home/alarm/current'
+import { pendingDeviceAlarm } from '@/api/home/operation/alarm'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -30,11 +31,13 @@
 
 // 初始化对话框
 const data = ref()
+const type = ref('')
 const initDialog = (row: any) => {
   data.value = row
   dialogFormVisible.value = true
   resetForm()
   dataForm.value.alarmId = row.id
+  type.value = row.type
 }
 defineExpose({
   initDialog,
@@ -44,7 +47,7 @@
 const saveData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      pendingAlarm(dataForm.value).then((res) => {
+      (type.value === 'data' ? pendingAlarm : pendingDeviceAlarm)(dataForm.value).then((res) => {
         ElMessage.success('操作成功')
         dialogFormVisible.value = false
         data.value.processStatus = 3
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index c65a637..b6fcb2d 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -7,12 +7,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-import { batchDelete, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
+import { batchDelete, detailAlarm, getCurrentAlarmListPage } from '@/api/home/alarm/current'
 import { getDictByCode } from '@/api/system/dict'
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
 import { shortcuts } from '@/utils/common'
+import { toHumpObject } from '@/utils/String'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -138,16 +139,16 @@
 // 查看报警
 const mapRef = ref()
 const mapData = ref({})
-const detail = (row: any) => {
+const detail = async (row: any) => {
+  const res = await detailAlarm(row.id)
+  const data = toHumpObject(res.data)
   mapData.value = row
   switchMode('map')
-  row.lngGaode = '116.398043'
-  row.latGaode = '39.901552'
   // 绘制点
   const draw = () => {
     mapRef.value.mapRef.removeMarker()
     mapRef.value.mapRef.addMarker({
-      position: [row.lngGaode, row.latGaode],
+      position: [data.lngGaode, data.latGaode],
       content: '<div class="spread-circle"></div>',
       label: '',
     })
@@ -155,11 +156,11 @@
     mapRef.value.mapRef.map.setZoom(15)
     mapRef.value.openInfoDetail({
       ...row,
-      lnglat: [row.lngGaode, row.latGaode],
+      lnglat: [data.lngGaode, data.latGaode],
     })
   }
   setTimeout(() => {
-    if (!row.lngGaode || !row.latGaode) {
+    if (!data.lngGaode || !data.latGaode) {
       ElMessage.warning('该数据缺少坐标信息')
       return
     }
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index 3247ac8..1abcb64 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -8,7 +8,7 @@
 import detailData from './detailData.vue'
 import showPosition from './showPosition.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
-import { getDeviceDetail } from '@/api/home/device/device'
+import { getDeviceListPage } from '@/api/home/device/device'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -77,12 +77,17 @@
 // 获取闸井详情数据
 const fetchWellDetail = () => {
   loading.value = true
-  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
-    loading.value = false
-    detailInfo.value = JSON.parse($route.query.row as string)
-    detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
-    detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || ''
-    loading.value = false
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+    }
+    catch (err) {
+      loading.value = false
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 2b228a0..0b75fd4 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -131,7 +131,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.deviceName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 52e035f..799fc90 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -81,7 +81,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.productName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 7df5933..59f1343 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -75,7 +75,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.typeName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index d56a41c..91ad1ca 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -90,7 +90,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.pipeCode}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 688e419..54a3218 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -81,7 +81,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.name}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
new file mode 100644
index 0000000..849f2ee
--- /dev/null
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -0,0 +1,263 @@
+<!--
+  Description: 设备报警-详情
+  Author: 李亚光
+  Date: 2023-09-14
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import { alarmProcessNode } from '@/api/home/alarm/current'
+import { getAlarmDetail } from '@/api/home/alarm/history'
+import { deviceAlarmView } from '@/api/home/operation/alarm'
+import { toHumpObject } from '@/utils/String'
+import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
+import { getDateDiff } from '@/utils/dayjs'
+import showPosition from '@/views/home/device/device/components/showPosition.vue'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'devTypeName',
+    align: 'center',
+  },
+
+  {
+    text: '报警编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '报警类别',
+    value: 'alarmCategory',
+    align: 'center',
+  },
+  {
+    text: '报警类型',
+    value: 'alarmTypeName',
+    align: 'center',
+  },
+  {
+    text: '报警原因',
+    value: 'alarmMsg',
+    align: 'center',
+  },
+  {
+    text: '报警等级',
+    value: 'alarmLevelName',
+    align: 'center',
+  },
+  {
+    text: '报警时间',
+    value: $route.query.type === 'history' ? 'alarmTime' : 'ts',
+    align: 'center',
+  },
+  {
+    text: '位置',
+    value: 'ledgerNumber',
+    align: 'center',
+  },
+  {
+    text: '详细地址',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '负责人',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '是否误报',
+    value: 'realAlarmName',
+    align: 'center',
+  },
+  {
+    text: '解除时间',
+    value: 'cancelTime',
+    align: 'center',
+  },
+  {
+    text: '处置时长',
+    value: $route.query.type === 'history' ? 'cancelDuration' : 'duration',
+    align: 'center',
+  },
+  {
+    text: '',
+    value: '',
+    align: '',
+  },
+])
+// 报警动态
+const alarmDynamics = ref<any[]>([])
+// 页面loading
+const loading = ref(false)
+const loadingDynamics = ref(false)
+// 获取闸井详情数据
+const fetchDetail = async () => {
+  loading.value = true
+  const res1 = await getAlarmLevelListPage({ offset: 1, limit: 9999 })
+  const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
+  ($route.query.type === 'history' ? getAlarmDetail : deviceAlarmView)($route.query.id as string).then((res) => {
+    detailInfo.value = toHumpObject(res.data)
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
+    detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
+    detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
+    console.log(detailInfo.value, 'detailInfo.value')
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+
+  // 获取报警动态
+  loadingDynamics.value = true
+  const info = JSON.parse($route.query.row as string)
+  alarmProcessNode($route.query.id as string).then((res) => {
+    alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
+    alarmDynamics.value.unshift({
+      approvalTime: info.ts, // 报警生成时间
+      process_name: '',
+      approvalPerson: '报警生成',
+      dept_name: '',
+    })
+    loadingDynamics.value = false
+  }).catch(() => {
+    loadingDynamics.value = false
+  })
+}
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  console.log(data, 'data')
+  if (data.text === '位置') {
+    if (detailInfo.value.watchObject && detailInfo.value.devcode && detailInfo.value.ledgerId) {
+      const watchObject = {
+        1: 'WellMonitorDetail',
+        2: 'StationMonitorDetail',
+        3: 'PipelineMonitorDetail',
+      } as { [key: string]: string }
+      $router.push({
+        name: watchObject[detailInfo.value.watchObject],
+        query: {
+          id: detailInfo.value.ledgerId,
+          deviceCode: detailInfo.value.devcode,
+          typeName: detailInfo.value.devTypeName,
+          row: JSON.stringify({
+            id: detailInfo.value.ledgerId,
+            typeName: detailInfo.value.devTypeName,
+            deviceCode: detailInfo.value.devcode,
+          }),
+        },
+      })
+      // $router
+    }
+    return
+  }
+  if (data.text !== '详细地址' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lngGaode || !detailInfo.value.latGaode) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lngGaode, detailInfo.value.latGaode])
+}
+onMounted(() => {
+  fetchDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <show-position ref="mapRef" />
+    <detail-page title="报警详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span
+            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' ? 'pointer link' : ''}`"
+            @click="showMap(item)"
+          >
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+        <el-descriptions-item v-loading="loadingDynamics" align="left" label-align="center">
+          <template #label>
+            <span class="label">
+              报警动态
+            </span>
+          </template>
+          <div style="padding: 25px;">
+            <el-timeline>
+              <el-timeline-item
+                v-for="(item, index) in alarmDynamics" :key="index" :timestamp="item.approvalTime"
+                type="primary"
+              >
+                {{ `${item.approvalPerson}${item.dept_name ? '(' : ''}${item.dept_name}${item.dept_name ? ')'
+                  : ''}${item.process_name}` }}
+              </el-timeline-item>
+            </el-timeline>
+          </div>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
+.link {
+  color: #3d7eff;
+
+  &:hover {
+    text-decoration: underline;
+  }
+}
+
+.bottom {
+  --el-descriptions-table-border-top: none;
+
+  ::v-deep(.el-descriptions) {
+    --el-descriptions-table-border-top: none;
+  }
+}
+</style>

diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts
new file mode 100644
index 0000000..2723ec8
--- /dev/null
+++ b/src/api/home/operation/alarm.ts
@@ -0,0 +1,41 @@
+/**
+ * 设备当前报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceCurrentListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查看
+export function deviceAlarmView(id: any) {
+  return request({
+    url: '/maintenance/alarmRecords/deviceAlarmView',
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+// 挂起
+export function pendingDeviceAlarm(data: any) {
+  return request({
+    url: '/maintenance/alarmRecords/suspend',
+    method: 'post',
+    data,
+  })
+}
+// 批量删除
+export function batchRemoveRow(ids: any) {
+  return request({
+    url: '/maintenance/alarmRecords/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts
new file mode 100644
index 0000000..a26ad3f
--- /dev/null
+++ b/src/api/home/operation/history.ts
@@ -0,0 +1,14 @@
+/**
+ * 设备历史报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceHistoryListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/historyListPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index ed722fb..6f58857 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -355,6 +355,19 @@
         },
       },
       {
+        path: 'alarm/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationAlarmDetail',
+        meta: {
+          title: '设备报警详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/alarm',
+          auth: '/operation/alarm',
+        },
+      },
+      {
         path: 'history',
         component: () => import('@/views/home/operation/history/index.vue'),
         name: 'operationHistory',
@@ -368,6 +381,19 @@
         },
       },
       {
+        path: 'history/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationHistoryDetail',
+        meta: {
+          title: '历史设备报警',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/history',
+          auth: '/operation/history',
+        },
+      },
+      {
         path: 'trajectory',
         component: () => import('@/views/home/operation/trajectory/index.vue'),
         name: 'operationTrajectory',
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 7ac6332..30aa05e 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -9,6 +9,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import processDialog from './processDialog.vue'
 import { detailAlarm } from '@/api/home/alarm/current'
+import { deviceAlarmView } from '@/api/home/operation/alarm'
 import { toHumpObject } from '@/utils/String'
 const dialogFormVisible = ref(false)
 const overlay = ref()
@@ -32,15 +33,20 @@
   processContent: '',
   processStatus: '',
   id: '',
+  type: '',
 })
+const type = ref('')
 const initDialog = (e: any) => {
   console.log(e, '信息窗体接收的数据')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   dialogFormVisible.value = true
-  info.value = e.info
-  detailAlarm(e.info.id).then((res) => {
+  type.value = e.type
+  info.value = e.info;
+
+  (type.value === 'data' ? detailAlarm : deviceAlarmView)(e.info.id).then((res) => {
     info.value = toHumpObject(res.data) as any
+    console.log(info.value, 'info.value')
   })
 }
 
@@ -53,13 +59,26 @@
 const $router = useRouter()
 const moreData = () => {
   $router.push({
-    name: 'AlarmCurrentDetail',
+    name: type.value === 'data' ? 'AlarmCurrentDetail' : 'operationAlarmDetail',
     query: {
       id: info.value.id,
       row: JSON.stringify(info.value),
     },
   })
 }
+// 设备详情
+const goDevice = () => {
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
 // 提醒责任人
 const remindRef = ref()
 const remind = () => {
@@ -68,13 +87,18 @@
 // 挂起
 const pendingRef = ref()
 const pending = () => {
-  pendingRef.value.initDialog(info.value)
+  pendingRef.value.initDialog({ ...info.value, type: type.value })
 }
 // 查看流程
 const processRef = ref()
 const viewProcess = () => {
   processRef.value.initDialog(info.value)
 }
+// 报警处置
+const handlerRef = ref()
+const handler = () => {
+  handlerRef.value.initDialog(info.value)
+}
 defineExpose({ initDialog, close })
 </script>
 
@@ -94,7 +118,13 @@
       <span class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备编号:
+        <span style="padding-left: 6px;" class="more" @click="goDevice">
+          {{ info.devcode }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警类别:
         <span style="padding-left: 6px;">
           {{ info.alarmCategory }}
@@ -106,7 +136,13 @@
           {{ info.alarmMsg }}
         </span>
       </div>
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备类型:
+        <span style="padding-left: 6px;">
+          {{ info.devTypeName }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
@@ -164,7 +200,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -176,9 +212,12 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4" size="small" @click="remind">
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
         提醒责任人
       </el-button>
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'device'" size="small" @click="handler">
+        报警处置
+      </el-button>
       <el-button v-if="Number(info.processStatus) <= 3" type="primary" size="small" @click="pending">
         挂起
       </el-button>
@@ -233,14 +272,14 @@
     display: flex;
     justify-content: space-between;
     font-size: 16px;
+  }
 
-    .more {
-      color: #3d7eff;
+  .more {
+    color: #3d7eff;
 
-      &:hover {
-        cursor: pointer;
-        text-decoration: underline;
-      }
+    &:hover {
+      cursor: pointer;
+      text-decoration: underline;
     }
   }
 
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index 6e1b260..a8b44a6 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -46,6 +46,7 @@
     infoWindow: detail.value,
     info: $props.data,
     map: mapRef.value.map,
+    type: 'data',
   })
   setTimeout(() => {
     // mapRef.value.map.setFitView()
@@ -75,6 +76,7 @@
       infoWindow: detail.value,
       info: data,
       map: mapRef.value.map,
+      type: 'data',
     })
     setTimeout(() => {
       // mapRef.value.map.setFitView()
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index df1cd85..dcac82c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -7,6 +7,7 @@
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { pendingAlarm } from '@/api/home/alarm/current'
+import { pendingDeviceAlarm } from '@/api/home/operation/alarm'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -30,11 +31,13 @@
 
 // 初始化对话框
 const data = ref()
+const type = ref('')
 const initDialog = (row: any) => {
   data.value = row
   dialogFormVisible.value = true
   resetForm()
   dataForm.value.alarmId = row.id
+  type.value = row.type
 }
 defineExpose({
   initDialog,
@@ -44,7 +47,7 @@
 const saveData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      pendingAlarm(dataForm.value).then((res) => {
+      (type.value === 'data' ? pendingAlarm : pendingDeviceAlarm)(dataForm.value).then((res) => {
         ElMessage.success('操作成功')
         dialogFormVisible.value = false
         data.value.processStatus = 3
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index c65a637..b6fcb2d 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -7,12 +7,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-import { batchDelete, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
+import { batchDelete, detailAlarm, getCurrentAlarmListPage } from '@/api/home/alarm/current'
 import { getDictByCode } from '@/api/system/dict'
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
 import { shortcuts } from '@/utils/common'
+import { toHumpObject } from '@/utils/String'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -138,16 +139,16 @@
 // 查看报警
 const mapRef = ref()
 const mapData = ref({})
-const detail = (row: any) => {
+const detail = async (row: any) => {
+  const res = await detailAlarm(row.id)
+  const data = toHumpObject(res.data)
   mapData.value = row
   switchMode('map')
-  row.lngGaode = '116.398043'
-  row.latGaode = '39.901552'
   // 绘制点
   const draw = () => {
     mapRef.value.mapRef.removeMarker()
     mapRef.value.mapRef.addMarker({
-      position: [row.lngGaode, row.latGaode],
+      position: [data.lngGaode, data.latGaode],
       content: '<div class="spread-circle"></div>',
       label: '',
     })
@@ -155,11 +156,11 @@
     mapRef.value.mapRef.map.setZoom(15)
     mapRef.value.openInfoDetail({
       ...row,
-      lnglat: [row.lngGaode, row.latGaode],
+      lnglat: [data.lngGaode, data.latGaode],
     })
   }
   setTimeout(() => {
-    if (!row.lngGaode || !row.latGaode) {
+    if (!data.lngGaode || !data.latGaode) {
       ElMessage.warning('该数据缺少坐标信息')
       return
     }
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index 3247ac8..1abcb64 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -8,7 +8,7 @@
 import detailData from './detailData.vue'
 import showPosition from './showPosition.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
-import { getDeviceDetail } from '@/api/home/device/device'
+import { getDeviceListPage } from '@/api/home/device/device'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -77,12 +77,17 @@
 // 获取闸井详情数据
 const fetchWellDetail = () => {
   loading.value = true
-  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
-    loading.value = false
-    detailInfo.value = JSON.parse($route.query.row as string)
-    detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
-    detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || ''
-    loading.value = false
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+    }
+    catch (err) {
+      loading.value = false
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 2b228a0..0b75fd4 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -131,7 +131,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.deviceName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 52e035f..799fc90 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -81,7 +81,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.productName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 7df5933..59f1343 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -75,7 +75,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.typeName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index d56a41c..91ad1ca 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -90,7 +90,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.pipeCode}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 688e419..54a3218 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -81,7 +81,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.name}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
new file mode 100644
index 0000000..849f2ee
--- /dev/null
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -0,0 +1,263 @@
+<!--
+  Description: 设备报警-详情
+  Author: 李亚光
+  Date: 2023-09-14
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import { alarmProcessNode } from '@/api/home/alarm/current'
+import { getAlarmDetail } from '@/api/home/alarm/history'
+import { deviceAlarmView } from '@/api/home/operation/alarm'
+import { toHumpObject } from '@/utils/String'
+import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
+import { getDateDiff } from '@/utils/dayjs'
+import showPosition from '@/views/home/device/device/components/showPosition.vue'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'devTypeName',
+    align: 'center',
+  },
+
+  {
+    text: '报警编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '报警类别',
+    value: 'alarmCategory',
+    align: 'center',
+  },
+  {
+    text: '报警类型',
+    value: 'alarmTypeName',
+    align: 'center',
+  },
+  {
+    text: '报警原因',
+    value: 'alarmMsg',
+    align: 'center',
+  },
+  {
+    text: '报警等级',
+    value: 'alarmLevelName',
+    align: 'center',
+  },
+  {
+    text: '报警时间',
+    value: $route.query.type === 'history' ? 'alarmTime' : 'ts',
+    align: 'center',
+  },
+  {
+    text: '位置',
+    value: 'ledgerNumber',
+    align: 'center',
+  },
+  {
+    text: '详细地址',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '负责人',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '是否误报',
+    value: 'realAlarmName',
+    align: 'center',
+  },
+  {
+    text: '解除时间',
+    value: 'cancelTime',
+    align: 'center',
+  },
+  {
+    text: '处置时长',
+    value: $route.query.type === 'history' ? 'cancelDuration' : 'duration',
+    align: 'center',
+  },
+  {
+    text: '',
+    value: '',
+    align: '',
+  },
+])
+// 报警动态
+const alarmDynamics = ref<any[]>([])
+// 页面loading
+const loading = ref(false)
+const loadingDynamics = ref(false)
+// 获取闸井详情数据
+const fetchDetail = async () => {
+  loading.value = true
+  const res1 = await getAlarmLevelListPage({ offset: 1, limit: 9999 })
+  const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
+  ($route.query.type === 'history' ? getAlarmDetail : deviceAlarmView)($route.query.id as string).then((res) => {
+    detailInfo.value = toHumpObject(res.data)
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
+    detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
+    detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
+    console.log(detailInfo.value, 'detailInfo.value')
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+
+  // 获取报警动态
+  loadingDynamics.value = true
+  const info = JSON.parse($route.query.row as string)
+  alarmProcessNode($route.query.id as string).then((res) => {
+    alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
+    alarmDynamics.value.unshift({
+      approvalTime: info.ts, // 报警生成时间
+      process_name: '',
+      approvalPerson: '报警生成',
+      dept_name: '',
+    })
+    loadingDynamics.value = false
+  }).catch(() => {
+    loadingDynamics.value = false
+  })
+}
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  console.log(data, 'data')
+  if (data.text === '位置') {
+    if (detailInfo.value.watchObject && detailInfo.value.devcode && detailInfo.value.ledgerId) {
+      const watchObject = {
+        1: 'WellMonitorDetail',
+        2: 'StationMonitorDetail',
+        3: 'PipelineMonitorDetail',
+      } as { [key: string]: string }
+      $router.push({
+        name: watchObject[detailInfo.value.watchObject],
+        query: {
+          id: detailInfo.value.ledgerId,
+          deviceCode: detailInfo.value.devcode,
+          typeName: detailInfo.value.devTypeName,
+          row: JSON.stringify({
+            id: detailInfo.value.ledgerId,
+            typeName: detailInfo.value.devTypeName,
+            deviceCode: detailInfo.value.devcode,
+          }),
+        },
+      })
+      // $router
+    }
+    return
+  }
+  if (data.text !== '详细地址' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lngGaode || !detailInfo.value.latGaode) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lngGaode, detailInfo.value.latGaode])
+}
+onMounted(() => {
+  fetchDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <show-position ref="mapRef" />
+    <detail-page title="报警详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span
+            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' ? 'pointer link' : ''}`"
+            @click="showMap(item)"
+          >
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+        <el-descriptions-item v-loading="loadingDynamics" align="left" label-align="center">
+          <template #label>
+            <span class="label">
+              报警动态
+            </span>
+          </template>
+          <div style="padding: 25px;">
+            <el-timeline>
+              <el-timeline-item
+                v-for="(item, index) in alarmDynamics" :key="index" :timestamp="item.approvalTime"
+                type="primary"
+              >
+                {{ `${item.approvalPerson}${item.dept_name ? '(' : ''}${item.dept_name}${item.dept_name ? ')'
+                  : ''}${item.process_name}` }}
+              </el-timeline-item>
+            </el-timeline>
+          </div>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
+.link {
+  color: #3d7eff;
+
+  &:hover {
+    text-decoration: underline;
+  }
+}
+
+.bottom {
+  --el-descriptions-table-border-top: none;
+
+  ::v-deep(.el-descriptions) {
+    --el-descriptions-table-border-top: none;
+  }
+}
+</style>
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 30f312e..0d10efa 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -4,13 +4,19 @@
   Date: 2023-07-08
  -->
 <script lang="ts" setup name="AlarmMap">
+import detailInfo from '@/views/home/alarm/current/components/detailInfoDialog.vue'
 import AMap from '@/components/map/index.vue'
 const $props = defineProps({
   height: {
     type: Number,
     default: 0,
   },
+  data: {
+    type: Object,
+    default: () => ({}),
+  },
 })
+
 // 地图实例
 const mapRef = ref()
 // 地图加载状态
@@ -20,15 +26,80 @@
   completeFlag.value = true
   console.log('地图加载完成')
 }
+// 点标记弹窗
+const detail = ref()
+const detailRef = ref()
+const markerClick = (data: any) => {
+  // 定义弹窗
+  detail.value = new mapRef.value.AMap.InfoWindow({
+    closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体
+    autoMove: true, // 是否自动调整窗体到视野内
+    isCustom: true, // 自定义信息窗体
+    content: detailRef.value.$el, // 窗体内容(vue组件)
+    offset: new mapRef.value.AMap.Pixel(9, -5), // 偏移
+  })
+  // 打开信息窗口
+  detail.value.open(data.map, data.data.position)
+  // 初始化信息窗口
+  detailRef.value.initDialog({
+    overlay: data.event.target,
+    infoWindow: detail.value,
+    info: $props.data,
+    map: mapRef.value.map,
+    type: 'device',
+  })
+  setTimeout(() => {
+    // mapRef.value.map.setFitView()
+    // mapRef.value.map.setCenter(data.data.position)
+    const center = JSON.parse(JSON.stringify(data.data.position))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
+  })
+}
+
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  // mapRef.value.map.setZoom(10.5)
+  // 定义弹窗
+  detail.value = new mapRef.value.AMap.InfoWindow({
+    closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体
+    autoMove: true, // 是否自动调整窗体到视野内
+    isCustom: true, // 自定义信息窗体
+    content: detailRef.value.$el, // 窗体内容(vue组件)
+    offset: new mapRef.value.AMap.Pixel(9, -5), // 偏移
+  })
+  // 打开信息窗口
+  setTimeout(() => {
+    detail.value.open(mapRef.value.map, data.lnglat)
+    // 初始化信息窗口
+    detailRef.value.initDialog({
+      infoWindow: detail.value,
+      info: data,
+      map: mapRef.value.map,
+      type: 'device',
+    })
+    setTimeout(() => {
+      // mapRef.value.map.setFitView()
+      const center = JSON.parse(JSON.stringify(data.lnglat))
+      center[1] = Number(center[1]) + 0.0035
+      mapRef.value.map.setCenter(center)
+    })
+    // mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+
 defineExpose({
   mapRef,
   completeFlag,
+  openInfoDetail,
 })
 </script>
 
 <template>
   <div :style="`height: ${$props.height}px`" class="map-container">
-    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
+    <!-- 设备信息窗体 -->
+    <detail-info ref="detailRef" />
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" @markerClick="markerClick" />
   </div>
 </template>
 

diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts
new file mode 100644
index 0000000..2723ec8
--- /dev/null
+++ b/src/api/home/operation/alarm.ts
@@ -0,0 +1,41 @@
+/**
+ * 设备当前报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceCurrentListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查看
+export function deviceAlarmView(id: any) {
+  return request({
+    url: '/maintenance/alarmRecords/deviceAlarmView',
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+// 挂起
+export function pendingDeviceAlarm(data: any) {
+  return request({
+    url: '/maintenance/alarmRecords/suspend',
+    method: 'post',
+    data,
+  })
+}
+// 批量删除
+export function batchRemoveRow(ids: any) {
+  return request({
+    url: '/maintenance/alarmRecords/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts
new file mode 100644
index 0000000..a26ad3f
--- /dev/null
+++ b/src/api/home/operation/history.ts
@@ -0,0 +1,14 @@
+/**
+ * 设备历史报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceHistoryListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/historyListPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index ed722fb..6f58857 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -355,6 +355,19 @@
         },
       },
       {
+        path: 'alarm/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationAlarmDetail',
+        meta: {
+          title: '设备报警详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/alarm',
+          auth: '/operation/alarm',
+        },
+      },
+      {
         path: 'history',
         component: () => import('@/views/home/operation/history/index.vue'),
         name: 'operationHistory',
@@ -368,6 +381,19 @@
         },
       },
       {
+        path: 'history/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationHistoryDetail',
+        meta: {
+          title: '历史设备报警',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/history',
+          auth: '/operation/history',
+        },
+      },
+      {
         path: 'trajectory',
         component: () => import('@/views/home/operation/trajectory/index.vue'),
         name: 'operationTrajectory',
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 7ac6332..30aa05e 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -9,6 +9,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import processDialog from './processDialog.vue'
 import { detailAlarm } from '@/api/home/alarm/current'
+import { deviceAlarmView } from '@/api/home/operation/alarm'
 import { toHumpObject } from '@/utils/String'
 const dialogFormVisible = ref(false)
 const overlay = ref()
@@ -32,15 +33,20 @@
   processContent: '',
   processStatus: '',
   id: '',
+  type: '',
 })
+const type = ref('')
 const initDialog = (e: any) => {
   console.log(e, '信息窗体接收的数据')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   dialogFormVisible.value = true
-  info.value = e.info
-  detailAlarm(e.info.id).then((res) => {
+  type.value = e.type
+  info.value = e.info;
+
+  (type.value === 'data' ? detailAlarm : deviceAlarmView)(e.info.id).then((res) => {
     info.value = toHumpObject(res.data) as any
+    console.log(info.value, 'info.value')
   })
 }
 
@@ -53,13 +59,26 @@
 const $router = useRouter()
 const moreData = () => {
   $router.push({
-    name: 'AlarmCurrentDetail',
+    name: type.value === 'data' ? 'AlarmCurrentDetail' : 'operationAlarmDetail',
     query: {
       id: info.value.id,
       row: JSON.stringify(info.value),
     },
   })
 }
+// 设备详情
+const goDevice = () => {
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
 // 提醒责任人
 const remindRef = ref()
 const remind = () => {
@@ -68,13 +87,18 @@
 // 挂起
 const pendingRef = ref()
 const pending = () => {
-  pendingRef.value.initDialog(info.value)
+  pendingRef.value.initDialog({ ...info.value, type: type.value })
 }
 // 查看流程
 const processRef = ref()
 const viewProcess = () => {
   processRef.value.initDialog(info.value)
 }
+// 报警处置
+const handlerRef = ref()
+const handler = () => {
+  handlerRef.value.initDialog(info.value)
+}
 defineExpose({ initDialog, close })
 </script>
 
@@ -94,7 +118,13 @@
       <span class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备编号:
+        <span style="padding-left: 6px;" class="more" @click="goDevice">
+          {{ info.devcode }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警类别:
         <span style="padding-left: 6px;">
           {{ info.alarmCategory }}
@@ -106,7 +136,13 @@
           {{ info.alarmMsg }}
         </span>
       </div>
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备类型:
+        <span style="padding-left: 6px;">
+          {{ info.devTypeName }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
@@ -164,7 +200,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -176,9 +212,12 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4" size="small" @click="remind">
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
         提醒责任人
       </el-button>
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'device'" size="small" @click="handler">
+        报警处置
+      </el-button>
       <el-button v-if="Number(info.processStatus) <= 3" type="primary" size="small" @click="pending">
         挂起
       </el-button>
@@ -233,14 +272,14 @@
     display: flex;
     justify-content: space-between;
     font-size: 16px;
+  }
 
-    .more {
-      color: #3d7eff;
+  .more {
+    color: #3d7eff;
 
-      &:hover {
-        cursor: pointer;
-        text-decoration: underline;
-      }
+    &:hover {
+      cursor: pointer;
+      text-decoration: underline;
     }
   }
 
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index 6e1b260..a8b44a6 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -46,6 +46,7 @@
     infoWindow: detail.value,
     info: $props.data,
     map: mapRef.value.map,
+    type: 'data',
   })
   setTimeout(() => {
     // mapRef.value.map.setFitView()
@@ -75,6 +76,7 @@
       infoWindow: detail.value,
       info: data,
       map: mapRef.value.map,
+      type: 'data',
     })
     setTimeout(() => {
       // mapRef.value.map.setFitView()
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index df1cd85..dcac82c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -7,6 +7,7 @@
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { pendingAlarm } from '@/api/home/alarm/current'
+import { pendingDeviceAlarm } from '@/api/home/operation/alarm'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -30,11 +31,13 @@
 
 // 初始化对话框
 const data = ref()
+const type = ref('')
 const initDialog = (row: any) => {
   data.value = row
   dialogFormVisible.value = true
   resetForm()
   dataForm.value.alarmId = row.id
+  type.value = row.type
 }
 defineExpose({
   initDialog,
@@ -44,7 +47,7 @@
 const saveData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      pendingAlarm(dataForm.value).then((res) => {
+      (type.value === 'data' ? pendingAlarm : pendingDeviceAlarm)(dataForm.value).then((res) => {
         ElMessage.success('操作成功')
         dialogFormVisible.value = false
         data.value.processStatus = 3
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index c65a637..b6fcb2d 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -7,12 +7,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-import { batchDelete, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
+import { batchDelete, detailAlarm, getCurrentAlarmListPage } from '@/api/home/alarm/current'
 import { getDictByCode } from '@/api/system/dict'
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
 import { shortcuts } from '@/utils/common'
+import { toHumpObject } from '@/utils/String'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -138,16 +139,16 @@
 // 查看报警
 const mapRef = ref()
 const mapData = ref({})
-const detail = (row: any) => {
+const detail = async (row: any) => {
+  const res = await detailAlarm(row.id)
+  const data = toHumpObject(res.data)
   mapData.value = row
   switchMode('map')
-  row.lngGaode = '116.398043'
-  row.latGaode = '39.901552'
   // 绘制点
   const draw = () => {
     mapRef.value.mapRef.removeMarker()
     mapRef.value.mapRef.addMarker({
-      position: [row.lngGaode, row.latGaode],
+      position: [data.lngGaode, data.latGaode],
       content: '<div class="spread-circle"></div>',
       label: '',
     })
@@ -155,11 +156,11 @@
     mapRef.value.mapRef.map.setZoom(15)
     mapRef.value.openInfoDetail({
       ...row,
-      lnglat: [row.lngGaode, row.latGaode],
+      lnglat: [data.lngGaode, data.latGaode],
     })
   }
   setTimeout(() => {
-    if (!row.lngGaode || !row.latGaode) {
+    if (!data.lngGaode || !data.latGaode) {
       ElMessage.warning('该数据缺少坐标信息')
       return
     }
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index 3247ac8..1abcb64 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -8,7 +8,7 @@
 import detailData from './detailData.vue'
 import showPosition from './showPosition.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
-import { getDeviceDetail } from '@/api/home/device/device'
+import { getDeviceListPage } from '@/api/home/device/device'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -77,12 +77,17 @@
 // 获取闸井详情数据
 const fetchWellDetail = () => {
   loading.value = true
-  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
-    loading.value = false
-    detailInfo.value = JSON.parse($route.query.row as string)
-    detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
-    detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || ''
-    loading.value = false
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+    }
+    catch (err) {
+      loading.value = false
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 2b228a0..0b75fd4 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -131,7 +131,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.deviceName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 52e035f..799fc90 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -81,7 +81,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.productName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 7df5933..59f1343 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -75,7 +75,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.typeName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index d56a41c..91ad1ca 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -90,7 +90,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.pipeCode}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 688e419..54a3218 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -81,7 +81,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.name}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
new file mode 100644
index 0000000..849f2ee
--- /dev/null
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -0,0 +1,263 @@
+<!--
+  Description: 设备报警-详情
+  Author: 李亚光
+  Date: 2023-09-14
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import { alarmProcessNode } from '@/api/home/alarm/current'
+import { getAlarmDetail } from '@/api/home/alarm/history'
+import { deviceAlarmView } from '@/api/home/operation/alarm'
+import { toHumpObject } from '@/utils/String'
+import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
+import { getDateDiff } from '@/utils/dayjs'
+import showPosition from '@/views/home/device/device/components/showPosition.vue'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'devTypeName',
+    align: 'center',
+  },
+
+  {
+    text: '报警编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '报警类别',
+    value: 'alarmCategory',
+    align: 'center',
+  },
+  {
+    text: '报警类型',
+    value: 'alarmTypeName',
+    align: 'center',
+  },
+  {
+    text: '报警原因',
+    value: 'alarmMsg',
+    align: 'center',
+  },
+  {
+    text: '报警等级',
+    value: 'alarmLevelName',
+    align: 'center',
+  },
+  {
+    text: '报警时间',
+    value: $route.query.type === 'history' ? 'alarmTime' : 'ts',
+    align: 'center',
+  },
+  {
+    text: '位置',
+    value: 'ledgerNumber',
+    align: 'center',
+  },
+  {
+    text: '详细地址',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '负责人',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '是否误报',
+    value: 'realAlarmName',
+    align: 'center',
+  },
+  {
+    text: '解除时间',
+    value: 'cancelTime',
+    align: 'center',
+  },
+  {
+    text: '处置时长',
+    value: $route.query.type === 'history' ? 'cancelDuration' : 'duration',
+    align: 'center',
+  },
+  {
+    text: '',
+    value: '',
+    align: '',
+  },
+])
+// 报警动态
+const alarmDynamics = ref<any[]>([])
+// 页面loading
+const loading = ref(false)
+const loadingDynamics = ref(false)
+// 获取闸井详情数据
+const fetchDetail = async () => {
+  loading.value = true
+  const res1 = await getAlarmLevelListPage({ offset: 1, limit: 9999 })
+  const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
+  ($route.query.type === 'history' ? getAlarmDetail : deviceAlarmView)($route.query.id as string).then((res) => {
+    detailInfo.value = toHumpObject(res.data)
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
+    detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
+    detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
+    console.log(detailInfo.value, 'detailInfo.value')
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+
+  // 获取报警动态
+  loadingDynamics.value = true
+  const info = JSON.parse($route.query.row as string)
+  alarmProcessNode($route.query.id as string).then((res) => {
+    alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
+    alarmDynamics.value.unshift({
+      approvalTime: info.ts, // 报警生成时间
+      process_name: '',
+      approvalPerson: '报警生成',
+      dept_name: '',
+    })
+    loadingDynamics.value = false
+  }).catch(() => {
+    loadingDynamics.value = false
+  })
+}
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  console.log(data, 'data')
+  if (data.text === '位置') {
+    if (detailInfo.value.watchObject && detailInfo.value.devcode && detailInfo.value.ledgerId) {
+      const watchObject = {
+        1: 'WellMonitorDetail',
+        2: 'StationMonitorDetail',
+        3: 'PipelineMonitorDetail',
+      } as { [key: string]: string }
+      $router.push({
+        name: watchObject[detailInfo.value.watchObject],
+        query: {
+          id: detailInfo.value.ledgerId,
+          deviceCode: detailInfo.value.devcode,
+          typeName: detailInfo.value.devTypeName,
+          row: JSON.stringify({
+            id: detailInfo.value.ledgerId,
+            typeName: detailInfo.value.devTypeName,
+            deviceCode: detailInfo.value.devcode,
+          }),
+        },
+      })
+      // $router
+    }
+    return
+  }
+  if (data.text !== '详细地址' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lngGaode || !detailInfo.value.latGaode) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lngGaode, detailInfo.value.latGaode])
+}
+onMounted(() => {
+  fetchDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <show-position ref="mapRef" />
+    <detail-page title="报警详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span
+            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' ? 'pointer link' : ''}`"
+            @click="showMap(item)"
+          >
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+        <el-descriptions-item v-loading="loadingDynamics" align="left" label-align="center">
+          <template #label>
+            <span class="label">
+              报警动态
+            </span>
+          </template>
+          <div style="padding: 25px;">
+            <el-timeline>
+              <el-timeline-item
+                v-for="(item, index) in alarmDynamics" :key="index" :timestamp="item.approvalTime"
+                type="primary"
+              >
+                {{ `${item.approvalPerson}${item.dept_name ? '(' : ''}${item.dept_name}${item.dept_name ? ')'
+                  : ''}${item.process_name}` }}
+              </el-timeline-item>
+            </el-timeline>
+          </div>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
+.link {
+  color: #3d7eff;
+
+  &:hover {
+    text-decoration: underline;
+  }
+}
+
+.bottom {
+  --el-descriptions-table-border-top: none;
+
+  ::v-deep(.el-descriptions) {
+    --el-descriptions-table-border-top: none;
+  }
+}
+</style>
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 30f312e..0d10efa 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -4,13 +4,19 @@
   Date: 2023-07-08
  -->
 <script lang="ts" setup name="AlarmMap">
+import detailInfo from '@/views/home/alarm/current/components/detailInfoDialog.vue'
 import AMap from '@/components/map/index.vue'
 const $props = defineProps({
   height: {
     type: Number,
     default: 0,
   },
+  data: {
+    type: Object,
+    default: () => ({}),
+  },
 })
+
 // 地图实例
 const mapRef = ref()
 // 地图加载状态
@@ -20,15 +26,80 @@
   completeFlag.value = true
   console.log('地图加载完成')
 }
+// 点标记弹窗
+const detail = ref()
+const detailRef = ref()
+const markerClick = (data: any) => {
+  // 定义弹窗
+  detail.value = new mapRef.value.AMap.InfoWindow({
+    closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体
+    autoMove: true, // 是否自动调整窗体到视野内
+    isCustom: true, // 自定义信息窗体
+    content: detailRef.value.$el, // 窗体内容(vue组件)
+    offset: new mapRef.value.AMap.Pixel(9, -5), // 偏移
+  })
+  // 打开信息窗口
+  detail.value.open(data.map, data.data.position)
+  // 初始化信息窗口
+  detailRef.value.initDialog({
+    overlay: data.event.target,
+    infoWindow: detail.value,
+    info: $props.data,
+    map: mapRef.value.map,
+    type: 'device',
+  })
+  setTimeout(() => {
+    // mapRef.value.map.setFitView()
+    // mapRef.value.map.setCenter(data.data.position)
+    const center = JSON.parse(JSON.stringify(data.data.position))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
+  })
+}
+
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  // mapRef.value.map.setZoom(10.5)
+  // 定义弹窗
+  detail.value = new mapRef.value.AMap.InfoWindow({
+    closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体
+    autoMove: true, // 是否自动调整窗体到视野内
+    isCustom: true, // 自定义信息窗体
+    content: detailRef.value.$el, // 窗体内容(vue组件)
+    offset: new mapRef.value.AMap.Pixel(9, -5), // 偏移
+  })
+  // 打开信息窗口
+  setTimeout(() => {
+    detail.value.open(mapRef.value.map, data.lnglat)
+    // 初始化信息窗口
+    detailRef.value.initDialog({
+      infoWindow: detail.value,
+      info: data,
+      map: mapRef.value.map,
+      type: 'device',
+    })
+    setTimeout(() => {
+      // mapRef.value.map.setFitView()
+      const center = JSON.parse(JSON.stringify(data.lnglat))
+      center[1] = Number(center[1]) + 0.0035
+      mapRef.value.map.setCenter(center)
+    })
+    // mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+
 defineExpose({
   mapRef,
   completeFlag,
+  openInfoDetail,
 })
 </script>
 
 <template>
   <div :style="`height: ${$props.height}px`" class="map-container">
-    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
+    <!-- 设备信息窗体 -->
+    <detail-info ref="detailRef" />
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" @markerClick="markerClick" />
   </div>
 </template>
 
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index 7527f72..1688e59 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -4,20 +4,32 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
-import { ElMessage } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
 import { shortcuts } from '@/utils/common'
+import { getDictByCode } from '@/api/system/dict'
+import { batchRemoveRow, deviceAlarmView, getDeviceCurrentListPage } from '@/api/home/operation/alarm'
+import { getManufacturerListPage } from '@/api/home/device/product'
+import { uniqueMultiArray } from '@/utils/Array'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getAlarmTypeListPage } from '@/api/home/rule/alarm'
+import { toHumpObject } from '@/utils/String'
+const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+const manufacturerList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+const alarmStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 报警状态
 // 表格数据
 const list1 = ref<any[]>([])
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '设备编号', value: 'devicecode', align: 'center' },
-  { text: '报警类型', value: 'alarmTypeName', align: 'center' },
-  { text: '报警原因', value: 'alarmReason', align: 'center' },
+  { text: '设备编号', value: 'devCode', align: 'center' },
+  { text: '设备类型', value: 'devTypeName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center' },
+  { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '状态', value: 'status', align: 'center', width: '110' },
+  { text: '状态', value: 'processStatus', align: 'center', width: '110' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '200' },
 ])
 // 最终展示列
@@ -31,126 +43,55 @@
 const listQuery = ref({
   limit: 20,
   offset: 1,
+  alarmTypeId: '',
+  devTypeId: '',
+  processStatus: '',
+  deptId: '',
+  manufacturerId: '',
+  position: '',
+  begTime: '',
+  endTime: '',
+  devCode: '',
 })
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  // listQuery.createTimeStart = ''
-  // listQuery.createTimeEnd = ''
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      // listQuery.createTimeStart = `${newVal[0]} 00:00:00`
-      // listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+      listQuery.value.begTime = `${newVal[0]} 00:00:00`
+      listQuery.value.endTime = `${newVal[1]} 23:59:59`
     }
   }
 })
 // 查询数据
 const fetchData = () => {
-  setTimeout(() => {
+  loadingTable.value = true
+  getDeviceCurrentListPage(listQuery.value).then((res) => {
+    list1.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
-    list1.value = [
-      {
-        alarmTypeName: '闸井浓度超限',
-        alarmRank: '一级',
-        alarmReason: '燃气浓度23%vol',
-        position: 'N121422南小街中压',
-        deviceType: '燃气智能监测终端',
-        devicecode: '342022010027',
-        deptName: '第一分公司/运维1所/1班',
-        status: '未读',
-        alarmTime: '2024-07-01 12:45:50',
-        lat: '39.91081620470105',
-        lng: '116.2590451793805',
-      },
-      {
-        alarmTypeName: '闸井浓度超限',
-        alarmRank: '二级',
-        alarmReason: '燃气浓度23%vol',
-        position: 'N121422南小街中压',
-        deviceType: '燃气智能监测终端',
-        devicecode: '342022010027',
-        deptName: '第一分公司/运维1所/1班',
-        status: '未读',
-        alarmTime: '',
-        lat: '39.911268',
-        lng: '116.343489',
-      },
-      {
-        alarmTypeName: '疑似第三方破坏',
-        alarmRank: '一级',
-        alarmReason: '桩倾斜报警',
-        position: 'N121422南小街中压',
-        deviceType: '智能监测桩',
-        devicecode: '342022010027',
-        deptName: '第一分公司/运维1所/1班',
-        status: '已确认',
-        alarmTime: '',
-        lat: '39.943322',
-        lng: '116.403976',
-      },
-      {
-        alarmTypeName: '设备故障',
-        alarmRank: '三级',
-        alarmReason: '传感器异常',
-        position: '422南小街中压',
-        deviceType: '管线哨兵',
-        deviceNo: '342022010027',
-        deptName: '第一分公司/运维1所/1班',
-        status: '挂起',
-        alarmTime: '',
-        lat: '39.901552',
-        lng: '116.398043',
-      },
-      {
-        alarmTypeName: '设备故障',
-        alarmRank: '三级',
-        alarmReason: '传感器异常',
-        position: '422南小街中压',
-        deviceType: '管线哨兵',
-        devicecode: '342022010027',
-        deptName: '第一分公司/运维1所/1班',
-        status: '挂起',
-        alarmTime: '',
-      },
-      {
-        alarmTypeName: '设备故障',
-        alarmRank: '三级',
-        alarmReason: '传感器异常',
-        position: '422南小街中压',
-        deviceType: '管线哨兵',
-        devicecode: '342022010027',
-        deptName: '第一分公司/运维1所/1班',
-        status: '挂起',
-        alarmTime: '',
-      },
-      {
-        alarmTypeName: '设备故障',
-        alarmRank: '三级',
-        alarmReason: '传感器异常',
-        position: '422南小街中压',
-        deviceType: '管线哨兵',
-        devicecode: '342022010027',
-        dept: '第一分公司/运维1所/1班',
-        status: '挂起',
-        alarmTime: '',
-      },
-      {
-        alarmTypeName: '设备故障',
-        alarmRank: '三级',
-        alarmReason: '传感器异常',
-        position: '422南小街中压',
-        deviceType: '管线哨兵',
-        deviceNo: '342022010027',
-        dept: '第一分公司/运维1所/1班',
-        status: '挂起',
-        alarmTime: '',
-      },
-    ] as any[]
-  }, 1000)
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 // 重置查询条件f
 const reset = () => {
-
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+    alarmTypeId: '',
+    devTypeId: '',
+    processStatus: '',
+    deptId: '',
+    manufacturerId: '',
+    position: '',
+    begTime: '',
+    endTime: '',
+    devCode: '',
+  }
+  fetchData()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
@@ -175,35 +116,50 @@
     return
   }
   tableFlag.value = type
-  tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+  // tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+  tableHeight.value = window.innerHeight - 60 - 50 - 98 - 20
 }
 watch(() => list1.value, () => {
   if (list1.value.length) {
-    tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+    // tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+    tableHeight.value = window.innerHeight - 60 - 50 - 98 - 20
   }
 })
 window.addEventListener('resize', () => {
-  tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+  // tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+  tableHeight.value = window.innerHeight - 60 - 50 - 98 - 20
 })
 // 查看报警
 const mapRef = ref()
-const detail = (row: any) => {
+const mapData = ref({})
+const detail = async (row: any) => {
+  const res = await deviceAlarmView(row.id)
+  const data = toHumpObject(res.data)
+  data.lngGaode = '116.30981'
+  data.latGaode = '38.10923'
+  mapData.value = row
   switchMode('map')
   // 绘制点
   const draw = () => {
-    mapRef.value.mapRef.map.setCenter([row.lng, row.lat])
     mapRef.value.mapRef.removeMarker()
     mapRef.value.mapRef.addMarker({
-      position: [row.lng, row.lat],
-      content: '',
+      position: [data.lngGaode, data.latGaode],
+      content: '<div class="spread-circle"></div>',
       label: '',
     })
+    mapRef.value.mapRef.map.setFitView()
+    mapRef.value.mapRef.map.setZoom(15)
+    mapRef.value.openInfoDetail({
+      ...row,
+      lnglat: [data.lngGaode, data.latGaode],
+    })
   }
   setTimeout(() => {
-    if (!row.lng || !row.lat) {
+    if (!data.lngGaode || !data.latGaode) {
       ElMessage.warning('该数据缺少坐标信息')
       return
     }
+    // 已读
     if (mapRef.value.completeFlag) {
       draw()
     }
@@ -212,11 +168,70 @@
         draw()
       }, 1000)
     }
-    // console.log(mapRef.value)
-    // lat: '39.901552',
-    // lng: '116.398043',
   })
 }
+// 批量删除
+const { proxy } = getCurrentInstance() as any
+// 多选
+const multipleTable = ref([])
+const handleSelectionChange = (val: any) => {
+  console.log(val, '多选数据')
+  multipleTable.value = val
+}
+// 批量删除
+const batchDeleteRow = () => {
+  if (!multipleTable.value.length) {
+    ElMessage.warning('请先选中数据')
+    return
+  }
+  ElMessageBox.confirm(
+    '确定要删除选中的数据吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    batchRemoveRow(multipleTable.value.map((item: any) => item.id)).then(() => {
+      ElMessage.success('操作成功')
+      multipleTable.value = []
+      fetchData()
+    })
+  })
+}
+// 字典
+const fetchDict = () => {
+  // 报警类型
+  getAlarmTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
+    alarmTypeList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({
+      name: item.alarmType,
+      value: item.id,
+      id: item.id,
+    })), 'name')
+  })
+  // 设备类型
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
+    deviceTypeList.value = res.data.rows.map((item: any) => ({
+      name: item.typeName,
+      value: item.id,
+      id: item.id,
+    }))
+  })
+  // 厂商列表
+  getManufacturerListPage().then((res) => {
+    manufacturerList.value = res.data.rows.map((item: any) => ({
+      name: item.name || '',
+      id: item.id,
+      value: item.id,
+    }))
+  })
+  // 报警状态
+  getDictByCode('alarmStatus').then((res) => {
+    alarmStatusList.value = res.data
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -225,28 +240,39 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
+        <el-select v-model="listQuery.alarmTypeId" placeholder="报警类型" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in alarmTypeList" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
+        <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
+        <el-select v-model="listQuery.processStatus" placeholder="报警状态" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in alarmStatusList" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
       </search-item>
       <search-item>
         <dept-select
-          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select"
+          v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" class="select"
           style="width: 192px;"
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="厂商" clearable class="select" style="width: 192px;" />
+        <el-select
+          v-model="listQuery.manufacturerId" placeholder="厂商" clearable filterable class="select"
+          style="width: 192px;"
+        >
+          <el-option v-for="item in manufacturerList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
+        <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
+        <el-input v-model.trim="listQuery.devCode" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
         <el-date-picker
@@ -269,6 +295,9 @@
           <template #btns-right>
             <!-- 操作 -->
             <div>
+              <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
+                批量删除
+              </el-button>
               <el-button type="primary">
                 导出
               </el-button>
@@ -277,7 +306,10 @@
           <!-- 查询结果Table显示 -->
           <normal-table
             :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" @change="changePage"
+            :list-loading="loadingTable" :height="tableHeight - 50 - 70"
+            :is-multi="proxy.hasPerm('/alarm/device/delete')"
+            :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
+            @multiSelect="handleSelectionChange"
           >
             <template #preColumns>
               <el-table-column label="序号" width="55" align="center">
@@ -314,7 +346,7 @@
       </div>
       <!-- 地图 -->
       <div v-if="tableFlag === 'map'" :style="`height: ${tableHeight}px`" class="map">
-        <map-com ref="mapRef" :height="tableHeight" />
+        <map-com ref="mapRef" :height="tableHeight - 10" :data="mapData" />
       </div>
     </div>
   </app-container>
@@ -376,4 +408,11 @@
 .select {
   width: 192px !important;
 }
+
+.spread-circle {
+  width: 25px;
+  height: 25px;
+  border-radius: 50%;
+  background: url("@/assets/images/spread.gif") no-repeat center center / cover;
+}
 </style>

diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts
new file mode 100644
index 0000000..2723ec8
--- /dev/null
+++ b/src/api/home/operation/alarm.ts
@@ -0,0 +1,41 @@
+/**
+ * 设备当前报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceCurrentListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查看
+export function deviceAlarmView(id: any) {
+  return request({
+    url: '/maintenance/alarmRecords/deviceAlarmView',
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+// 挂起
+export function pendingDeviceAlarm(data: any) {
+  return request({
+    url: '/maintenance/alarmRecords/suspend',
+    method: 'post',
+    data,
+  })
+}
+// 批量删除
+export function batchRemoveRow(ids: any) {
+  return request({
+    url: '/maintenance/alarmRecords/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts
new file mode 100644
index 0000000..a26ad3f
--- /dev/null
+++ b/src/api/home/operation/history.ts
@@ -0,0 +1,14 @@
+/**
+ * 设备历史报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceHistoryListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/historyListPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index ed722fb..6f58857 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -355,6 +355,19 @@
         },
       },
       {
+        path: 'alarm/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationAlarmDetail',
+        meta: {
+          title: '设备报警详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/alarm',
+          auth: '/operation/alarm',
+        },
+      },
+      {
         path: 'history',
         component: () => import('@/views/home/operation/history/index.vue'),
         name: 'operationHistory',
@@ -368,6 +381,19 @@
         },
       },
       {
+        path: 'history/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationHistoryDetail',
+        meta: {
+          title: '历史设备报警',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/history',
+          auth: '/operation/history',
+        },
+      },
+      {
         path: 'trajectory',
         component: () => import('@/views/home/operation/trajectory/index.vue'),
         name: 'operationTrajectory',
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 7ac6332..30aa05e 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -9,6 +9,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import processDialog from './processDialog.vue'
 import { detailAlarm } from '@/api/home/alarm/current'
+import { deviceAlarmView } from '@/api/home/operation/alarm'
 import { toHumpObject } from '@/utils/String'
 const dialogFormVisible = ref(false)
 const overlay = ref()
@@ -32,15 +33,20 @@
   processContent: '',
   processStatus: '',
   id: '',
+  type: '',
 })
+const type = ref('')
 const initDialog = (e: any) => {
   console.log(e, '信息窗体接收的数据')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   dialogFormVisible.value = true
-  info.value = e.info
-  detailAlarm(e.info.id).then((res) => {
+  type.value = e.type
+  info.value = e.info;
+
+  (type.value === 'data' ? detailAlarm : deviceAlarmView)(e.info.id).then((res) => {
     info.value = toHumpObject(res.data) as any
+    console.log(info.value, 'info.value')
   })
 }
 
@@ -53,13 +59,26 @@
 const $router = useRouter()
 const moreData = () => {
   $router.push({
-    name: 'AlarmCurrentDetail',
+    name: type.value === 'data' ? 'AlarmCurrentDetail' : 'operationAlarmDetail',
     query: {
       id: info.value.id,
       row: JSON.stringify(info.value),
     },
   })
 }
+// 设备详情
+const goDevice = () => {
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
 // 提醒责任人
 const remindRef = ref()
 const remind = () => {
@@ -68,13 +87,18 @@
 // 挂起
 const pendingRef = ref()
 const pending = () => {
-  pendingRef.value.initDialog(info.value)
+  pendingRef.value.initDialog({ ...info.value, type: type.value })
 }
 // 查看流程
 const processRef = ref()
 const viewProcess = () => {
   processRef.value.initDialog(info.value)
 }
+// 报警处置
+const handlerRef = ref()
+const handler = () => {
+  handlerRef.value.initDialog(info.value)
+}
 defineExpose({ initDialog, close })
 </script>
 
@@ -94,7 +118,13 @@
       <span class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备编号:
+        <span style="padding-left: 6px;" class="more" @click="goDevice">
+          {{ info.devcode }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警类别:
         <span style="padding-left: 6px;">
           {{ info.alarmCategory }}
@@ -106,7 +136,13 @@
           {{ info.alarmMsg }}
         </span>
       </div>
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备类型:
+        <span style="padding-left: 6px;">
+          {{ info.devTypeName }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
@@ -164,7 +200,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -176,9 +212,12 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4" size="small" @click="remind">
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
         提醒责任人
       </el-button>
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'device'" size="small" @click="handler">
+        报警处置
+      </el-button>
       <el-button v-if="Number(info.processStatus) <= 3" type="primary" size="small" @click="pending">
         挂起
       </el-button>
@@ -233,14 +272,14 @@
     display: flex;
     justify-content: space-between;
     font-size: 16px;
+  }
 
-    .more {
-      color: #3d7eff;
+  .more {
+    color: #3d7eff;
 
-      &:hover {
-        cursor: pointer;
-        text-decoration: underline;
-      }
+    &:hover {
+      cursor: pointer;
+      text-decoration: underline;
     }
   }
 
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index 6e1b260..a8b44a6 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -46,6 +46,7 @@
     infoWindow: detail.value,
     info: $props.data,
     map: mapRef.value.map,
+    type: 'data',
   })
   setTimeout(() => {
     // mapRef.value.map.setFitView()
@@ -75,6 +76,7 @@
       infoWindow: detail.value,
       info: data,
       map: mapRef.value.map,
+      type: 'data',
     })
     setTimeout(() => {
       // mapRef.value.map.setFitView()
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index df1cd85..dcac82c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -7,6 +7,7 @@
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { pendingAlarm } from '@/api/home/alarm/current'
+import { pendingDeviceAlarm } from '@/api/home/operation/alarm'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -30,11 +31,13 @@
 
 // 初始化对话框
 const data = ref()
+const type = ref('')
 const initDialog = (row: any) => {
   data.value = row
   dialogFormVisible.value = true
   resetForm()
   dataForm.value.alarmId = row.id
+  type.value = row.type
 }
 defineExpose({
   initDialog,
@@ -44,7 +47,7 @@
 const saveData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      pendingAlarm(dataForm.value).then((res) => {
+      (type.value === 'data' ? pendingAlarm : pendingDeviceAlarm)(dataForm.value).then((res) => {
         ElMessage.success('操作成功')
         dialogFormVisible.value = false
         data.value.processStatus = 3
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index c65a637..b6fcb2d 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -7,12 +7,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-import { batchDelete, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
+import { batchDelete, detailAlarm, getCurrentAlarmListPage } from '@/api/home/alarm/current'
 import { getDictByCode } from '@/api/system/dict'
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
 import { shortcuts } from '@/utils/common'
+import { toHumpObject } from '@/utils/String'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -138,16 +139,16 @@
 // 查看报警
 const mapRef = ref()
 const mapData = ref({})
-const detail = (row: any) => {
+const detail = async (row: any) => {
+  const res = await detailAlarm(row.id)
+  const data = toHumpObject(res.data)
   mapData.value = row
   switchMode('map')
-  row.lngGaode = '116.398043'
-  row.latGaode = '39.901552'
   // 绘制点
   const draw = () => {
     mapRef.value.mapRef.removeMarker()
     mapRef.value.mapRef.addMarker({
-      position: [row.lngGaode, row.latGaode],
+      position: [data.lngGaode, data.latGaode],
       content: '<div class="spread-circle"></div>',
       label: '',
     })
@@ -155,11 +156,11 @@
     mapRef.value.mapRef.map.setZoom(15)
     mapRef.value.openInfoDetail({
       ...row,
-      lnglat: [row.lngGaode, row.latGaode],
+      lnglat: [data.lngGaode, data.latGaode],
     })
   }
   setTimeout(() => {
-    if (!row.lngGaode || !row.latGaode) {
+    if (!data.lngGaode || !data.latGaode) {
       ElMessage.warning('该数据缺少坐标信息')
       return
     }
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index 3247ac8..1abcb64 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -8,7 +8,7 @@
 import detailData from './detailData.vue'
 import showPosition from './showPosition.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
-import { getDeviceDetail } from '@/api/home/device/device'
+import { getDeviceListPage } from '@/api/home/device/device'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -77,12 +77,17 @@
 // 获取闸井详情数据
 const fetchWellDetail = () => {
   loading.value = true
-  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
-    loading.value = false
-    detailInfo.value = JSON.parse($route.query.row as string)
-    detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
-    detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || ''
-    loading.value = false
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+    }
+    catch (err) {
+      loading.value = false
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 2b228a0..0b75fd4 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -131,7 +131,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.deviceName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 52e035f..799fc90 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -81,7 +81,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.productName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 7df5933..59f1343 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -75,7 +75,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.typeName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index d56a41c..91ad1ca 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -90,7 +90,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.pipeCode}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 688e419..54a3218 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -81,7 +81,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.name}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
new file mode 100644
index 0000000..849f2ee
--- /dev/null
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -0,0 +1,263 @@
+<!--
+  Description: 设备报警-详情
+  Author: 李亚光
+  Date: 2023-09-14
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import { alarmProcessNode } from '@/api/home/alarm/current'
+import { getAlarmDetail } from '@/api/home/alarm/history'
+import { deviceAlarmView } from '@/api/home/operation/alarm'
+import { toHumpObject } from '@/utils/String'
+import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
+import { getDateDiff } from '@/utils/dayjs'
+import showPosition from '@/views/home/device/device/components/showPosition.vue'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'devTypeName',
+    align: 'center',
+  },
+
+  {
+    text: '报警编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '报警类别',
+    value: 'alarmCategory',
+    align: 'center',
+  },
+  {
+    text: '报警类型',
+    value: 'alarmTypeName',
+    align: 'center',
+  },
+  {
+    text: '报警原因',
+    value: 'alarmMsg',
+    align: 'center',
+  },
+  {
+    text: '报警等级',
+    value: 'alarmLevelName',
+    align: 'center',
+  },
+  {
+    text: '报警时间',
+    value: $route.query.type === 'history' ? 'alarmTime' : 'ts',
+    align: 'center',
+  },
+  {
+    text: '位置',
+    value: 'ledgerNumber',
+    align: 'center',
+  },
+  {
+    text: '详细地址',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '负责人',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '是否误报',
+    value: 'realAlarmName',
+    align: 'center',
+  },
+  {
+    text: '解除时间',
+    value: 'cancelTime',
+    align: 'center',
+  },
+  {
+    text: '处置时长',
+    value: $route.query.type === 'history' ? 'cancelDuration' : 'duration',
+    align: 'center',
+  },
+  {
+    text: '',
+    value: '',
+    align: '',
+  },
+])
+// 报警动态
+const alarmDynamics = ref<any[]>([])
+// 页面loading
+const loading = ref(false)
+const loadingDynamics = ref(false)
+// 获取闸井详情数据
+const fetchDetail = async () => {
+  loading.value = true
+  const res1 = await getAlarmLevelListPage({ offset: 1, limit: 9999 })
+  const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
+  ($route.query.type === 'history' ? getAlarmDetail : deviceAlarmView)($route.query.id as string).then((res) => {
+    detailInfo.value = toHumpObject(res.data)
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
+    detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
+    detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
+    console.log(detailInfo.value, 'detailInfo.value')
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+
+  // 获取报警动态
+  loadingDynamics.value = true
+  const info = JSON.parse($route.query.row as string)
+  alarmProcessNode($route.query.id as string).then((res) => {
+    alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
+    alarmDynamics.value.unshift({
+      approvalTime: info.ts, // 报警生成时间
+      process_name: '',
+      approvalPerson: '报警生成',
+      dept_name: '',
+    })
+    loadingDynamics.value = false
+  }).catch(() => {
+    loadingDynamics.value = false
+  })
+}
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  console.log(data, 'data')
+  if (data.text === '位置') {
+    if (detailInfo.value.watchObject && detailInfo.value.devcode && detailInfo.value.ledgerId) {
+      const watchObject = {
+        1: 'WellMonitorDetail',
+        2: 'StationMonitorDetail',
+        3: 'PipelineMonitorDetail',
+      } as { [key: string]: string }
+      $router.push({
+        name: watchObject[detailInfo.value.watchObject],
+        query: {
+          id: detailInfo.value.ledgerId,
+          deviceCode: detailInfo.value.devcode,
+          typeName: detailInfo.value.devTypeName,
+          row: JSON.stringify({
+            id: detailInfo.value.ledgerId,
+            typeName: detailInfo.value.devTypeName,
+            deviceCode: detailInfo.value.devcode,
+          }),
+        },
+      })
+      // $router
+    }
+    return
+  }
+  if (data.text !== '详细地址' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lngGaode || !detailInfo.value.latGaode) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lngGaode, detailInfo.value.latGaode])
+}
+onMounted(() => {
+  fetchDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <show-position ref="mapRef" />
+    <detail-page title="报警详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span
+            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' ? 'pointer link' : ''}`"
+            @click="showMap(item)"
+          >
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+        <el-descriptions-item v-loading="loadingDynamics" align="left" label-align="center">
+          <template #label>
+            <span class="label">
+              报警动态
+            </span>
+          </template>
+          <div style="padding: 25px;">
+            <el-timeline>
+              <el-timeline-item
+                v-for="(item, index) in alarmDynamics" :key="index" :timestamp="item.approvalTime"
+                type="primary"
+              >
+                {{ `${item.approvalPerson}${item.dept_name ? '(' : ''}${item.dept_name}${item.dept_name ? ')'
+                  : ''}${item.process_name}` }}
+              </el-timeline-item>
+            </el-timeline>
+          </div>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
+.link {
+  color: #3d7eff;
+
+  &:hover {
+    text-decoration: underline;
+  }
+}
+
+.bottom {
+  --el-descriptions-table-border-top: none;
+
+  ::v-deep(.el-descriptions) {
+    --el-descriptions-table-border-top: none;
+  }
+}
+</style>
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 30f312e..0d10efa 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -4,13 +4,19 @@
   Date: 2023-07-08
  -->
 <script lang="ts" setup name="AlarmMap">
+import detailInfo from '@/views/home/alarm/current/components/detailInfoDialog.vue'
 import AMap from '@/components/map/index.vue'
 const $props = defineProps({
   height: {
     type: Number,
     default: 0,
   },
+  data: {
+    type: Object,
+    default: () => ({}),
+  },
 })
+
 // 地图实例
 const mapRef = ref()
 // 地图加载状态
@@ -20,15 +26,80 @@
   completeFlag.value = true
   console.log('地图加载完成')
 }
+// 点标记弹窗
+const detail = ref()
+const detailRef = ref()
+const markerClick = (data: any) => {
+  // 定义弹窗
+  detail.value = new mapRef.value.AMap.InfoWindow({
+    closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体
+    autoMove: true, // 是否自动调整窗体到视野内
+    isCustom: true, // 自定义信息窗体
+    content: detailRef.value.$el, // 窗体内容(vue组件)
+    offset: new mapRef.value.AMap.Pixel(9, -5), // 偏移
+  })
+  // 打开信息窗口
+  detail.value.open(data.map, data.data.position)
+  // 初始化信息窗口
+  detailRef.value.initDialog({
+    overlay: data.event.target,
+    infoWindow: detail.value,
+    info: $props.data,
+    map: mapRef.value.map,
+    type: 'device',
+  })
+  setTimeout(() => {
+    // mapRef.value.map.setFitView()
+    // mapRef.value.map.setCenter(data.data.position)
+    const center = JSON.parse(JSON.stringify(data.data.position))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
+  })
+}
+
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  // mapRef.value.map.setZoom(10.5)
+  // 定义弹窗
+  detail.value = new mapRef.value.AMap.InfoWindow({
+    closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体
+    autoMove: true, // 是否自动调整窗体到视野内
+    isCustom: true, // 自定义信息窗体
+    content: detailRef.value.$el, // 窗体内容(vue组件)
+    offset: new mapRef.value.AMap.Pixel(9, -5), // 偏移
+  })
+  // 打开信息窗口
+  setTimeout(() => {
+    detail.value.open(mapRef.value.map, data.lnglat)
+    // 初始化信息窗口
+    detailRef.value.initDialog({
+      infoWindow: detail.value,
+      info: data,
+      map: mapRef.value.map,
+      type: 'device',
+    })
+    setTimeout(() => {
+      // mapRef.value.map.setFitView()
+      const center = JSON.parse(JSON.stringify(data.lnglat))
+      center[1] = Number(center[1]) + 0.0035
+      mapRef.value.map.setCenter(center)
+    })
+    // mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+
 defineExpose({
   mapRef,
   completeFlag,
+  openInfoDetail,
 })
 </script>
 
 <template>
   <div :style="`height: ${$props.height}px`" class="map-container">
-    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
+    <!-- 设备信息窗体 -->
+    <detail-info ref="detailRef" />
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" @markerClick="markerClick" />
   </div>
 </template>
 
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index 7527f72..1688e59 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -4,20 +4,32 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
-import { ElMessage } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
 import { shortcuts } from '@/utils/common'
+import { getDictByCode } from '@/api/system/dict'
+import { batchRemoveRow, deviceAlarmView, getDeviceCurrentListPage } from '@/api/home/operation/alarm'
+import { getManufacturerListPage } from '@/api/home/device/product'
+import { uniqueMultiArray } from '@/utils/Array'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getAlarmTypeListPage } from '@/api/home/rule/alarm'
+import { toHumpObject } from '@/utils/String'
+const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+const manufacturerList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+const alarmStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 报警状态
 // 表格数据
 const list1 = ref<any[]>([])
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '设备编号', value: 'devicecode', align: 'center' },
-  { text: '报警类型', value: 'alarmTypeName', align: 'center' },
-  { text: '报警原因', value: 'alarmReason', align: 'center' },
+  { text: '设备编号', value: 'devCode', align: 'center' },
+  { text: '设备类型', value: 'devTypeName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center' },
+  { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '状态', value: 'status', align: 'center', width: '110' },
+  { text: '状态', value: 'processStatus', align: 'center', width: '110' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '200' },
 ])
 // 最终展示列
@@ -31,126 +43,55 @@
 const listQuery = ref({
   limit: 20,
   offset: 1,
+  alarmTypeId: '',
+  devTypeId: '',
+  processStatus: '',
+  deptId: '',
+  manufacturerId: '',
+  position: '',
+  begTime: '',
+  endTime: '',
+  devCode: '',
 })
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  // listQuery.createTimeStart = ''
-  // listQuery.createTimeEnd = ''
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      // listQuery.createTimeStart = `${newVal[0]} 00:00:00`
-      // listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+      listQuery.value.begTime = `${newVal[0]} 00:00:00`
+      listQuery.value.endTime = `${newVal[1]} 23:59:59`
     }
   }
 })
 // 查询数据
 const fetchData = () => {
-  setTimeout(() => {
+  loadingTable.value = true
+  getDeviceCurrentListPage(listQuery.value).then((res) => {
+    list1.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
-    list1.value = [
-      {
-        alarmTypeName: '闸井浓度超限',
-        alarmRank: '一级',
-        alarmReason: '燃气浓度23%vol',
-        position: 'N121422南小街中压',
-        deviceType: '燃气智能监测终端',
-        devicecode: '342022010027',
-        deptName: '第一分公司/运维1所/1班',
-        status: '未读',
-        alarmTime: '2024-07-01 12:45:50',
-        lat: '39.91081620470105',
-        lng: '116.2590451793805',
-      },
-      {
-        alarmTypeName: '闸井浓度超限',
-        alarmRank: '二级',
-        alarmReason: '燃气浓度23%vol',
-        position: 'N121422南小街中压',
-        deviceType: '燃气智能监测终端',
-        devicecode: '342022010027',
-        deptName: '第一分公司/运维1所/1班',
-        status: '未读',
-        alarmTime: '',
-        lat: '39.911268',
-        lng: '116.343489',
-      },
-      {
-        alarmTypeName: '疑似第三方破坏',
-        alarmRank: '一级',
-        alarmReason: '桩倾斜报警',
-        position: 'N121422南小街中压',
-        deviceType: '智能监测桩',
-        devicecode: '342022010027',
-        deptName: '第一分公司/运维1所/1班',
-        status: '已确认',
-        alarmTime: '',
-        lat: '39.943322',
-        lng: '116.403976',
-      },
-      {
-        alarmTypeName: '设备故障',
-        alarmRank: '三级',
-        alarmReason: '传感器异常',
-        position: '422南小街中压',
-        deviceType: '管线哨兵',
-        deviceNo: '342022010027',
-        deptName: '第一分公司/运维1所/1班',
-        status: '挂起',
-        alarmTime: '',
-        lat: '39.901552',
-        lng: '116.398043',
-      },
-      {
-        alarmTypeName: '设备故障',
-        alarmRank: '三级',
-        alarmReason: '传感器异常',
-        position: '422南小街中压',
-        deviceType: '管线哨兵',
-        devicecode: '342022010027',
-        deptName: '第一分公司/运维1所/1班',
-        status: '挂起',
-        alarmTime: '',
-      },
-      {
-        alarmTypeName: '设备故障',
-        alarmRank: '三级',
-        alarmReason: '传感器异常',
-        position: '422南小街中压',
-        deviceType: '管线哨兵',
-        devicecode: '342022010027',
-        deptName: '第一分公司/运维1所/1班',
-        status: '挂起',
-        alarmTime: '',
-      },
-      {
-        alarmTypeName: '设备故障',
-        alarmRank: '三级',
-        alarmReason: '传感器异常',
-        position: '422南小街中压',
-        deviceType: '管线哨兵',
-        devicecode: '342022010027',
-        dept: '第一分公司/运维1所/1班',
-        status: '挂起',
-        alarmTime: '',
-      },
-      {
-        alarmTypeName: '设备故障',
-        alarmRank: '三级',
-        alarmReason: '传感器异常',
-        position: '422南小街中压',
-        deviceType: '管线哨兵',
-        deviceNo: '342022010027',
-        dept: '第一分公司/运维1所/1班',
-        status: '挂起',
-        alarmTime: '',
-      },
-    ] as any[]
-  }, 1000)
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 // 重置查询条件f
 const reset = () => {
-
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+    alarmTypeId: '',
+    devTypeId: '',
+    processStatus: '',
+    deptId: '',
+    manufacturerId: '',
+    position: '',
+    begTime: '',
+    endTime: '',
+    devCode: '',
+  }
+  fetchData()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
@@ -175,35 +116,50 @@
     return
   }
   tableFlag.value = type
-  tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+  // tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+  tableHeight.value = window.innerHeight - 60 - 50 - 98 - 20
 }
 watch(() => list1.value, () => {
   if (list1.value.length) {
-    tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+    // tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+    tableHeight.value = window.innerHeight - 60 - 50 - 98 - 20
   }
 })
 window.addEventListener('resize', () => {
-  tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+  // tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+  tableHeight.value = window.innerHeight - 60 - 50 - 98 - 20
 })
 // 查看报警
 const mapRef = ref()
-const detail = (row: any) => {
+const mapData = ref({})
+const detail = async (row: any) => {
+  const res = await deviceAlarmView(row.id)
+  const data = toHumpObject(res.data)
+  data.lngGaode = '116.30981'
+  data.latGaode = '38.10923'
+  mapData.value = row
   switchMode('map')
   // 绘制点
   const draw = () => {
-    mapRef.value.mapRef.map.setCenter([row.lng, row.lat])
     mapRef.value.mapRef.removeMarker()
     mapRef.value.mapRef.addMarker({
-      position: [row.lng, row.lat],
-      content: '',
+      position: [data.lngGaode, data.latGaode],
+      content: '<div class="spread-circle"></div>',
       label: '',
     })
+    mapRef.value.mapRef.map.setFitView()
+    mapRef.value.mapRef.map.setZoom(15)
+    mapRef.value.openInfoDetail({
+      ...row,
+      lnglat: [data.lngGaode, data.latGaode],
+    })
   }
   setTimeout(() => {
-    if (!row.lng || !row.lat) {
+    if (!data.lngGaode || !data.latGaode) {
       ElMessage.warning('该数据缺少坐标信息')
       return
     }
+    // 已读
     if (mapRef.value.completeFlag) {
       draw()
     }
@@ -212,11 +168,70 @@
         draw()
       }, 1000)
     }
-    // console.log(mapRef.value)
-    // lat: '39.901552',
-    // lng: '116.398043',
   })
 }
+// 批量删除
+const { proxy } = getCurrentInstance() as any
+// 多选
+const multipleTable = ref([])
+const handleSelectionChange = (val: any) => {
+  console.log(val, '多选数据')
+  multipleTable.value = val
+}
+// 批量删除
+const batchDeleteRow = () => {
+  if (!multipleTable.value.length) {
+    ElMessage.warning('请先选中数据')
+    return
+  }
+  ElMessageBox.confirm(
+    '确定要删除选中的数据吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    batchRemoveRow(multipleTable.value.map((item: any) => item.id)).then(() => {
+      ElMessage.success('操作成功')
+      multipleTable.value = []
+      fetchData()
+    })
+  })
+}
+// 字典
+const fetchDict = () => {
+  // 报警类型
+  getAlarmTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
+    alarmTypeList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({
+      name: item.alarmType,
+      value: item.id,
+      id: item.id,
+    })), 'name')
+  })
+  // 设备类型
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
+    deviceTypeList.value = res.data.rows.map((item: any) => ({
+      name: item.typeName,
+      value: item.id,
+      id: item.id,
+    }))
+  })
+  // 厂商列表
+  getManufacturerListPage().then((res) => {
+    manufacturerList.value = res.data.rows.map((item: any) => ({
+      name: item.name || '',
+      id: item.id,
+      value: item.id,
+    }))
+  })
+  // 报警状态
+  getDictByCode('alarmStatus').then((res) => {
+    alarmStatusList.value = res.data
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -225,28 +240,39 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
+        <el-select v-model="listQuery.alarmTypeId" placeholder="报警类型" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in alarmTypeList" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
+        <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
+        <el-select v-model="listQuery.processStatus" placeholder="报警状态" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in alarmStatusList" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
       </search-item>
       <search-item>
         <dept-select
-          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select"
+          v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" class="select"
           style="width: 192px;"
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="厂商" clearable class="select" style="width: 192px;" />
+        <el-select
+          v-model="listQuery.manufacturerId" placeholder="厂商" clearable filterable class="select"
+          style="width: 192px;"
+        >
+          <el-option v-for="item in manufacturerList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
+        <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
+        <el-input v-model.trim="listQuery.devCode" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
         <el-date-picker
@@ -269,6 +295,9 @@
           <template #btns-right>
             <!-- 操作 -->
             <div>
+              <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
+                批量删除
+              </el-button>
               <el-button type="primary">
                 导出
               </el-button>
@@ -277,7 +306,10 @@
           <!-- 查询结果Table显示 -->
           <normal-table
             :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" @change="changePage"
+            :list-loading="loadingTable" :height="tableHeight - 50 - 70"
+            :is-multi="proxy.hasPerm('/alarm/device/delete')"
+            :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
+            @multiSelect="handleSelectionChange"
           >
             <template #preColumns>
               <el-table-column label="序号" width="55" align="center">
@@ -314,7 +346,7 @@
       </div>
       <!-- 地图 -->
       <div v-if="tableFlag === 'map'" :style="`height: ${tableHeight}px`" class="map">
-        <map-com ref="mapRef" :height="tableHeight" />
+        <map-com ref="mapRef" :height="tableHeight - 10" :data="mapData" />
       </div>
     </div>
   </app-container>
@@ -376,4 +408,11 @@
 .select {
   width: 192px !important;
 }
+
+.spread-circle {
+  width: 25px;
+  height: 25px;
+  border-radius: 50%;
+  background: url("@/assets/images/spread.gif") no-repeat center center / cover;
+}
 </style>
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index bc9ae81..b01f27c 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -4,22 +4,32 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="HistoryAlarm">
+import dayjs from 'dayjs'
 import { shortcuts } from '@/utils/common'
+import { getDictByCode } from '@/api/system/dict'
+import { getDeviceHistoryListPage } from '@/api/home/operation/history'
+import { getManufacturerListPage } from '@/api/home/device/product'
+import { uniqueMultiArray } from '@/utils/Array'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getAlarmTypeListPage } from '@/api/home/rule/alarm'
+const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+const manufacturerList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
 // 表格数据
 const list = ref([])
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '设备编号', value: '', align: 'center' },
-  { text: '报警类型', value: '', align: 'center' },
-  { text: '报警原因', value: '', align: 'center' },
-  { text: '厂商', value: '', align: 'center' },
-  { text: '设备类型', value: '', align: 'center' },
-  { text: '位置', value: '', align: 'center' },
-  { text: '管理单位', value: '', align: 'center' },
-  { text: '报警时间', value: '', align: 'center' },
-  { text: '解除时间', value: '', align: 'center' },
-  { text: '解除时长', value: '', align: 'center' },
+  { text: '设备编号', value: 'devCode', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center' },
+  { text: '报警原因', value: 'alarmContent', align: 'center' },
+  { text: '厂商', value: 'manufactureName', align: 'center' },
+  { text: '设备类型', value: 'devTypeName', align: 'center' },
+  { text: '位置', value: 'position', align: 'center' },
+  { text: '管理单位', value: 'deptName', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '110' },
+  { text: '解除时间', value: 'cancelTime', align: 'center', width: '190' },
+  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '190' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -32,28 +42,53 @@
 const listQuery = ref({
   limit: 20,
   offset: 1,
+  alarmTypeId: '',
+  devTypeId: '',
+  deptId: '',
+  manufacturerId: '',
+  position: '',
+  devCode: '',
+  begTime: '',
+  endTime: '',
 })
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  // listQuery.createTimeStart = ''
-  // listQuery.createTimeEnd = ''
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      // listQuery.createTimeStart = `${newVal[0]} 00:00:00`
-      // listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+      listQuery.value.begTime = `${newVal[0]} 00:00:00`
+      listQuery.value.endTime = `${newVal[1]} 23:59:59`
     }
   }
 })
 // 查询数据
 const fetchData = () => {
-  setTimeout(() => {
+  loadingTable.value = true
+  getDeviceHistoryListPage(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    loadingTable.value = false
+  }).catch(() => {
     loadingTable.value = false
   })
 }
 // 重置查询条件f
 const reset = () => {
-
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+    alarmTypeId: '',
+    devTypeId: '',
+    deptId: '',
+    manufacturerId: '',
+    position: '',
+    devCode: '',
+    begTime: '',
+    endTime: '',
+  }
+  fetchData()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
@@ -65,9 +100,50 @@
   }
   fetchData()
 }
-
+// 查看
+const $router = useRouter()
+const detailRow = (row: any) => {
+  $router.push({
+    name: 'operationHistoryDetail',
+    query: {
+      id: row.id,
+      type: 'history',
+    },
+  })
+}
+// 字典
+const fetchDict = () => {
+  // 报警类型
+  getAlarmTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
+    alarmTypeList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({
+      name: item.alarmType,
+      value: item.id,
+      id: item.id,
+    })), 'name')
+  })
+  // 设备类型
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
+    deviceTypeList.value = res.data.rows.map((item: any) => ({
+      name: item.typeName,
+      value: item.id,
+      id: item.id,
+    }))
+  })
+  // 厂商列表
+  getManufacturerListPage().then((res) => {
+    manufacturerList.value = res.data.rows.map((item: any) => ({
+      name: item.name || '',
+      id: item.id,
+      value: item.id,
+    }))
+  })
+}
+fetchDict()
 onMounted(() => {
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 </script>
 
@@ -77,25 +153,37 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
+        <el-select v-model="listQuery.alarmTypeId" placeholder="报警类型" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in alarmTypeList" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
+        <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
+      </search-item> -->
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" class="select"
+          style="width: 192px;"
+        />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
+        <el-select
+          v-model="listQuery.manufacturerId" placeholder="厂商" clearable filterable class="select"
+          style="width: 192px;"
+        >
+          <el-option v-for="item in manufacturerList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="厂商" clearable class="select" style="width: 192px;" />
+        <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
+        <el-input v-model.trim="listQuery.devCode" placeholder="设备编号" clearable />
       </search-item>
 
       <search-item>
@@ -139,7 +227,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detail(scope.row)">
+              <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
               </el-button>
             </template>

diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts
new file mode 100644
index 0000000..2723ec8
--- /dev/null
+++ b/src/api/home/operation/alarm.ts
@@ -0,0 +1,41 @@
+/**
+ * 设备当前报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceCurrentListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查看
+export function deviceAlarmView(id: any) {
+  return request({
+    url: '/maintenance/alarmRecords/deviceAlarmView',
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+// 挂起
+export function pendingDeviceAlarm(data: any) {
+  return request({
+    url: '/maintenance/alarmRecords/suspend',
+    method: 'post',
+    data,
+  })
+}
+// 批量删除
+export function batchRemoveRow(ids: any) {
+  return request({
+    url: '/maintenance/alarmRecords/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts
new file mode 100644
index 0000000..a26ad3f
--- /dev/null
+++ b/src/api/home/operation/history.ts
@@ -0,0 +1,14 @@
+/**
+ * 设备历史报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceHistoryListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/historyListPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index ed722fb..6f58857 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -355,6 +355,19 @@
         },
       },
       {
+        path: 'alarm/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationAlarmDetail',
+        meta: {
+          title: '设备报警详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/alarm',
+          auth: '/operation/alarm',
+        },
+      },
+      {
         path: 'history',
         component: () => import('@/views/home/operation/history/index.vue'),
         name: 'operationHistory',
@@ -368,6 +381,19 @@
         },
       },
       {
+        path: 'history/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationHistoryDetail',
+        meta: {
+          title: '历史设备报警',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/history',
+          auth: '/operation/history',
+        },
+      },
+      {
         path: 'trajectory',
         component: () => import('@/views/home/operation/trajectory/index.vue'),
         name: 'operationTrajectory',
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 7ac6332..30aa05e 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -9,6 +9,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import processDialog from './processDialog.vue'
 import { detailAlarm } from '@/api/home/alarm/current'
+import { deviceAlarmView } from '@/api/home/operation/alarm'
 import { toHumpObject } from '@/utils/String'
 const dialogFormVisible = ref(false)
 const overlay = ref()
@@ -32,15 +33,20 @@
   processContent: '',
   processStatus: '',
   id: '',
+  type: '',
 })
+const type = ref('')
 const initDialog = (e: any) => {
   console.log(e, '信息窗体接收的数据')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   dialogFormVisible.value = true
-  info.value = e.info
-  detailAlarm(e.info.id).then((res) => {
+  type.value = e.type
+  info.value = e.info;
+
+  (type.value === 'data' ? detailAlarm : deviceAlarmView)(e.info.id).then((res) => {
     info.value = toHumpObject(res.data) as any
+    console.log(info.value, 'info.value')
   })
 }
 
@@ -53,13 +59,26 @@
 const $router = useRouter()
 const moreData = () => {
   $router.push({
-    name: 'AlarmCurrentDetail',
+    name: type.value === 'data' ? 'AlarmCurrentDetail' : 'operationAlarmDetail',
     query: {
       id: info.value.id,
       row: JSON.stringify(info.value),
     },
   })
 }
+// 设备详情
+const goDevice = () => {
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
 // 提醒责任人
 const remindRef = ref()
 const remind = () => {
@@ -68,13 +87,18 @@
 // 挂起
 const pendingRef = ref()
 const pending = () => {
-  pendingRef.value.initDialog(info.value)
+  pendingRef.value.initDialog({ ...info.value, type: type.value })
 }
 // 查看流程
 const processRef = ref()
 const viewProcess = () => {
   processRef.value.initDialog(info.value)
 }
+// 报警处置
+const handlerRef = ref()
+const handler = () => {
+  handlerRef.value.initDialog(info.value)
+}
 defineExpose({ initDialog, close })
 </script>
 
@@ -94,7 +118,13 @@
       <span class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备编号:
+        <span style="padding-left: 6px;" class="more" @click="goDevice">
+          {{ info.devcode }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警类别:
         <span style="padding-left: 6px;">
           {{ info.alarmCategory }}
@@ -106,7 +136,13 @@
           {{ info.alarmMsg }}
         </span>
       </div>
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备类型:
+        <span style="padding-left: 6px;">
+          {{ info.devTypeName }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
@@ -164,7 +200,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -176,9 +212,12 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4" size="small" @click="remind">
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
         提醒责任人
       </el-button>
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'device'" size="small" @click="handler">
+        报警处置
+      </el-button>
       <el-button v-if="Number(info.processStatus) <= 3" type="primary" size="small" @click="pending">
         挂起
       </el-button>
@@ -233,14 +272,14 @@
     display: flex;
     justify-content: space-between;
     font-size: 16px;
+  }
 
-    .more {
-      color: #3d7eff;
+  .more {
+    color: #3d7eff;
 
-      &:hover {
-        cursor: pointer;
-        text-decoration: underline;
-      }
+    &:hover {
+      cursor: pointer;
+      text-decoration: underline;
     }
   }
 
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index 6e1b260..a8b44a6 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -46,6 +46,7 @@
     infoWindow: detail.value,
     info: $props.data,
     map: mapRef.value.map,
+    type: 'data',
   })
   setTimeout(() => {
     // mapRef.value.map.setFitView()
@@ -75,6 +76,7 @@
       infoWindow: detail.value,
       info: data,
       map: mapRef.value.map,
+      type: 'data',
     })
     setTimeout(() => {
       // mapRef.value.map.setFitView()
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index df1cd85..dcac82c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -7,6 +7,7 @@
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { pendingAlarm } from '@/api/home/alarm/current'
+import { pendingDeviceAlarm } from '@/api/home/operation/alarm'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -30,11 +31,13 @@
 
 // 初始化对话框
 const data = ref()
+const type = ref('')
 const initDialog = (row: any) => {
   data.value = row
   dialogFormVisible.value = true
   resetForm()
   dataForm.value.alarmId = row.id
+  type.value = row.type
 }
 defineExpose({
   initDialog,
@@ -44,7 +47,7 @@
 const saveData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      pendingAlarm(dataForm.value).then((res) => {
+      (type.value === 'data' ? pendingAlarm : pendingDeviceAlarm)(dataForm.value).then((res) => {
         ElMessage.success('操作成功')
         dialogFormVisible.value = false
         data.value.processStatus = 3
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index c65a637..b6fcb2d 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -7,12 +7,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-import { batchDelete, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
+import { batchDelete, detailAlarm, getCurrentAlarmListPage } from '@/api/home/alarm/current'
 import { getDictByCode } from '@/api/system/dict'
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
 import { shortcuts } from '@/utils/common'
+import { toHumpObject } from '@/utils/String'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -138,16 +139,16 @@
 // 查看报警
 const mapRef = ref()
 const mapData = ref({})
-const detail = (row: any) => {
+const detail = async (row: any) => {
+  const res = await detailAlarm(row.id)
+  const data = toHumpObject(res.data)
   mapData.value = row
   switchMode('map')
-  row.lngGaode = '116.398043'
-  row.latGaode = '39.901552'
   // 绘制点
   const draw = () => {
     mapRef.value.mapRef.removeMarker()
     mapRef.value.mapRef.addMarker({
-      position: [row.lngGaode, row.latGaode],
+      position: [data.lngGaode, data.latGaode],
       content: '<div class="spread-circle"></div>',
       label: '',
     })
@@ -155,11 +156,11 @@
     mapRef.value.mapRef.map.setZoom(15)
     mapRef.value.openInfoDetail({
       ...row,
-      lnglat: [row.lngGaode, row.latGaode],
+      lnglat: [data.lngGaode, data.latGaode],
     })
   }
   setTimeout(() => {
-    if (!row.lngGaode || !row.latGaode) {
+    if (!data.lngGaode || !data.latGaode) {
       ElMessage.warning('该数据缺少坐标信息')
       return
     }
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index 3247ac8..1abcb64 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -8,7 +8,7 @@
 import detailData from './detailData.vue'
 import showPosition from './showPosition.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
-import { getDeviceDetail } from '@/api/home/device/device'
+import { getDeviceListPage } from '@/api/home/device/device'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -77,12 +77,17 @@
 // 获取闸井详情数据
 const fetchWellDetail = () => {
   loading.value = true
-  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
-    loading.value = false
-    detailInfo.value = JSON.parse($route.query.row as string)
-    detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
-    detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || ''
-    loading.value = false
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+    }
+    catch (err) {
+      loading.value = false
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 2b228a0..0b75fd4 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -131,7 +131,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.deviceName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 52e035f..799fc90 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -81,7 +81,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.productName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 7df5933..59f1343 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -75,7 +75,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.typeName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index d56a41c..91ad1ca 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -90,7 +90,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.pipeCode}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 688e419..54a3218 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -81,7 +81,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.name}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
new file mode 100644
index 0000000..849f2ee
--- /dev/null
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -0,0 +1,263 @@
+<!--
+  Description: 设备报警-详情
+  Author: 李亚光
+  Date: 2023-09-14
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import { alarmProcessNode } from '@/api/home/alarm/current'
+import { getAlarmDetail } from '@/api/home/alarm/history'
+import { deviceAlarmView } from '@/api/home/operation/alarm'
+import { toHumpObject } from '@/utils/String'
+import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
+import { getDateDiff } from '@/utils/dayjs'
+import showPosition from '@/views/home/device/device/components/showPosition.vue'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'devTypeName',
+    align: 'center',
+  },
+
+  {
+    text: '报警编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '报警类别',
+    value: 'alarmCategory',
+    align: 'center',
+  },
+  {
+    text: '报警类型',
+    value: 'alarmTypeName',
+    align: 'center',
+  },
+  {
+    text: '报警原因',
+    value: 'alarmMsg',
+    align: 'center',
+  },
+  {
+    text: '报警等级',
+    value: 'alarmLevelName',
+    align: 'center',
+  },
+  {
+    text: '报警时间',
+    value: $route.query.type === 'history' ? 'alarmTime' : 'ts',
+    align: 'center',
+  },
+  {
+    text: '位置',
+    value: 'ledgerNumber',
+    align: 'center',
+  },
+  {
+    text: '详细地址',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '负责人',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '是否误报',
+    value: 'realAlarmName',
+    align: 'center',
+  },
+  {
+    text: '解除时间',
+    value: 'cancelTime',
+    align: 'center',
+  },
+  {
+    text: '处置时长',
+    value: $route.query.type === 'history' ? 'cancelDuration' : 'duration',
+    align: 'center',
+  },
+  {
+    text: '',
+    value: '',
+    align: '',
+  },
+])
+// 报警动态
+const alarmDynamics = ref<any[]>([])
+// 页面loading
+const loading = ref(false)
+const loadingDynamics = ref(false)
+// 获取闸井详情数据
+const fetchDetail = async () => {
+  loading.value = true
+  const res1 = await getAlarmLevelListPage({ offset: 1, limit: 9999 })
+  const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
+  ($route.query.type === 'history' ? getAlarmDetail : deviceAlarmView)($route.query.id as string).then((res) => {
+    detailInfo.value = toHumpObject(res.data)
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
+    detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
+    detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
+    console.log(detailInfo.value, 'detailInfo.value')
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+
+  // 获取报警动态
+  loadingDynamics.value = true
+  const info = JSON.parse($route.query.row as string)
+  alarmProcessNode($route.query.id as string).then((res) => {
+    alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
+    alarmDynamics.value.unshift({
+      approvalTime: info.ts, // 报警生成时间
+      process_name: '',
+      approvalPerson: '报警生成',
+      dept_name: '',
+    })
+    loadingDynamics.value = false
+  }).catch(() => {
+    loadingDynamics.value = false
+  })
+}
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  console.log(data, 'data')
+  if (data.text === '位置') {
+    if (detailInfo.value.watchObject && detailInfo.value.devcode && detailInfo.value.ledgerId) {
+      const watchObject = {
+        1: 'WellMonitorDetail',
+        2: 'StationMonitorDetail',
+        3: 'PipelineMonitorDetail',
+      } as { [key: string]: string }
+      $router.push({
+        name: watchObject[detailInfo.value.watchObject],
+        query: {
+          id: detailInfo.value.ledgerId,
+          deviceCode: detailInfo.value.devcode,
+          typeName: detailInfo.value.devTypeName,
+          row: JSON.stringify({
+            id: detailInfo.value.ledgerId,
+            typeName: detailInfo.value.devTypeName,
+            deviceCode: detailInfo.value.devcode,
+          }),
+        },
+      })
+      // $router
+    }
+    return
+  }
+  if (data.text !== '详细地址' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lngGaode || !detailInfo.value.latGaode) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lngGaode, detailInfo.value.latGaode])
+}
+onMounted(() => {
+  fetchDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <show-position ref="mapRef" />
+    <detail-page title="报警详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span
+            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' ? 'pointer link' : ''}`"
+            @click="showMap(item)"
+          >
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+        <el-descriptions-item v-loading="loadingDynamics" align="left" label-align="center">
+          <template #label>
+            <span class="label">
+              报警动态
+            </span>
+          </template>
+          <div style="padding: 25px;">
+            <el-timeline>
+              <el-timeline-item
+                v-for="(item, index) in alarmDynamics" :key="index" :timestamp="item.approvalTime"
+                type="primary"
+              >
+                {{ `${item.approvalPerson}${item.dept_name ? '(' : ''}${item.dept_name}${item.dept_name ? ')'
+                  : ''}${item.process_name}` }}
+              </el-timeline-item>
+            </el-timeline>
+          </div>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
+.link {
+  color: #3d7eff;
+
+  &:hover {
+    text-decoration: underline;
+  }
+}
+
+.bottom {
+  --el-descriptions-table-border-top: none;
+
+  ::v-deep(.el-descriptions) {
+    --el-descriptions-table-border-top: none;
+  }
+}
+</style>
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 30f312e..0d10efa 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -4,13 +4,19 @@
   Date: 2023-07-08
  -->
 <script lang="ts" setup name="AlarmMap">
+import detailInfo from '@/views/home/alarm/current/components/detailInfoDialog.vue'
 import AMap from '@/components/map/index.vue'
 const $props = defineProps({
   height: {
     type: Number,
     default: 0,
   },
+  data: {
+    type: Object,
+    default: () => ({}),
+  },
 })
+
 // 地图实例
 const mapRef = ref()
 // 地图加载状态
@@ -20,15 +26,80 @@
   completeFlag.value = true
   console.log('地图加载完成')
 }
+// 点标记弹窗
+const detail = ref()
+const detailRef = ref()
+const markerClick = (data: any) => {
+  // 定义弹窗
+  detail.value = new mapRef.value.AMap.InfoWindow({
+    closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体
+    autoMove: true, // 是否自动调整窗体到视野内
+    isCustom: true, // 自定义信息窗体
+    content: detailRef.value.$el, // 窗体内容(vue组件)
+    offset: new mapRef.value.AMap.Pixel(9, -5), // 偏移
+  })
+  // 打开信息窗口
+  detail.value.open(data.map, data.data.position)
+  // 初始化信息窗口
+  detailRef.value.initDialog({
+    overlay: data.event.target,
+    infoWindow: detail.value,
+    info: $props.data,
+    map: mapRef.value.map,
+    type: 'device',
+  })
+  setTimeout(() => {
+    // mapRef.value.map.setFitView()
+    // mapRef.value.map.setCenter(data.data.position)
+    const center = JSON.parse(JSON.stringify(data.data.position))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
+  })
+}
+
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  // mapRef.value.map.setZoom(10.5)
+  // 定义弹窗
+  detail.value = new mapRef.value.AMap.InfoWindow({
+    closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体
+    autoMove: true, // 是否自动调整窗体到视野内
+    isCustom: true, // 自定义信息窗体
+    content: detailRef.value.$el, // 窗体内容(vue组件)
+    offset: new mapRef.value.AMap.Pixel(9, -5), // 偏移
+  })
+  // 打开信息窗口
+  setTimeout(() => {
+    detail.value.open(mapRef.value.map, data.lnglat)
+    // 初始化信息窗口
+    detailRef.value.initDialog({
+      infoWindow: detail.value,
+      info: data,
+      map: mapRef.value.map,
+      type: 'device',
+    })
+    setTimeout(() => {
+      // mapRef.value.map.setFitView()
+      const center = JSON.parse(JSON.stringify(data.lnglat))
+      center[1] = Number(center[1]) + 0.0035
+      mapRef.value.map.setCenter(center)
+    })
+    // mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+
 defineExpose({
   mapRef,
   completeFlag,
+  openInfoDetail,
 })
 </script>
 
 <template>
   <div :style="`height: ${$props.height}px`" class="map-container">
-    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
+    <!-- 设备信息窗体 -->
+    <detail-info ref="detailRef" />
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" @markerClick="markerClick" />
   </div>
 </template>
 
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index 7527f72..1688e59 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -4,20 +4,32 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
-import { ElMessage } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
 import { shortcuts } from '@/utils/common'
+import { getDictByCode } from '@/api/system/dict'
+import { batchRemoveRow, deviceAlarmView, getDeviceCurrentListPage } from '@/api/home/operation/alarm'
+import { getManufacturerListPage } from '@/api/home/device/product'
+import { uniqueMultiArray } from '@/utils/Array'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getAlarmTypeListPage } from '@/api/home/rule/alarm'
+import { toHumpObject } from '@/utils/String'
+const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+const manufacturerList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+const alarmStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 报警状态
 // 表格数据
 const list1 = ref<any[]>([])
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '设备编号', value: 'devicecode', align: 'center' },
-  { text: '报警类型', value: 'alarmTypeName', align: 'center' },
-  { text: '报警原因', value: 'alarmReason', align: 'center' },
+  { text: '设备编号', value: 'devCode', align: 'center' },
+  { text: '设备类型', value: 'devTypeName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center' },
+  { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '状态', value: 'status', align: 'center', width: '110' },
+  { text: '状态', value: 'processStatus', align: 'center', width: '110' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '200' },
 ])
 // 最终展示列
@@ -31,126 +43,55 @@
 const listQuery = ref({
   limit: 20,
   offset: 1,
+  alarmTypeId: '',
+  devTypeId: '',
+  processStatus: '',
+  deptId: '',
+  manufacturerId: '',
+  position: '',
+  begTime: '',
+  endTime: '',
+  devCode: '',
 })
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  // listQuery.createTimeStart = ''
-  // listQuery.createTimeEnd = ''
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      // listQuery.createTimeStart = `${newVal[0]} 00:00:00`
-      // listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+      listQuery.value.begTime = `${newVal[0]} 00:00:00`
+      listQuery.value.endTime = `${newVal[1]} 23:59:59`
     }
   }
 })
 // 查询数据
 const fetchData = () => {
-  setTimeout(() => {
+  loadingTable.value = true
+  getDeviceCurrentListPage(listQuery.value).then((res) => {
+    list1.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
-    list1.value = [
-      {
-        alarmTypeName: '闸井浓度超限',
-        alarmRank: '一级',
-        alarmReason: '燃气浓度23%vol',
-        position: 'N121422南小街中压',
-        deviceType: '燃气智能监测终端',
-        devicecode: '342022010027',
-        deptName: '第一分公司/运维1所/1班',
-        status: '未读',
-        alarmTime: '2024-07-01 12:45:50',
-        lat: '39.91081620470105',
-        lng: '116.2590451793805',
-      },
-      {
-        alarmTypeName: '闸井浓度超限',
-        alarmRank: '二级',
-        alarmReason: '燃气浓度23%vol',
-        position: 'N121422南小街中压',
-        deviceType: '燃气智能监测终端',
-        devicecode: '342022010027',
-        deptName: '第一分公司/运维1所/1班',
-        status: '未读',
-        alarmTime: '',
-        lat: '39.911268',
-        lng: '116.343489',
-      },
-      {
-        alarmTypeName: '疑似第三方破坏',
-        alarmRank: '一级',
-        alarmReason: '桩倾斜报警',
-        position: 'N121422南小街中压',
-        deviceType: '智能监测桩',
-        devicecode: '342022010027',
-        deptName: '第一分公司/运维1所/1班',
-        status: '已确认',
-        alarmTime: '',
-        lat: '39.943322',
-        lng: '116.403976',
-      },
-      {
-        alarmTypeName: '设备故障',
-        alarmRank: '三级',
-        alarmReason: '传感器异常',
-        position: '422南小街中压',
-        deviceType: '管线哨兵',
-        deviceNo: '342022010027',
-        deptName: '第一分公司/运维1所/1班',
-        status: '挂起',
-        alarmTime: '',
-        lat: '39.901552',
-        lng: '116.398043',
-      },
-      {
-        alarmTypeName: '设备故障',
-        alarmRank: '三级',
-        alarmReason: '传感器异常',
-        position: '422南小街中压',
-        deviceType: '管线哨兵',
-        devicecode: '342022010027',
-        deptName: '第一分公司/运维1所/1班',
-        status: '挂起',
-        alarmTime: '',
-      },
-      {
-        alarmTypeName: '设备故障',
-        alarmRank: '三级',
-        alarmReason: '传感器异常',
-        position: '422南小街中压',
-        deviceType: '管线哨兵',
-        devicecode: '342022010027',
-        deptName: '第一分公司/运维1所/1班',
-        status: '挂起',
-        alarmTime: '',
-      },
-      {
-        alarmTypeName: '设备故障',
-        alarmRank: '三级',
-        alarmReason: '传感器异常',
-        position: '422南小街中压',
-        deviceType: '管线哨兵',
-        devicecode: '342022010027',
-        dept: '第一分公司/运维1所/1班',
-        status: '挂起',
-        alarmTime: '',
-      },
-      {
-        alarmTypeName: '设备故障',
-        alarmRank: '三级',
-        alarmReason: '传感器异常',
-        position: '422南小街中压',
-        deviceType: '管线哨兵',
-        deviceNo: '342022010027',
-        dept: '第一分公司/运维1所/1班',
-        status: '挂起',
-        alarmTime: '',
-      },
-    ] as any[]
-  }, 1000)
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 // 重置查询条件f
 const reset = () => {
-
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+    alarmTypeId: '',
+    devTypeId: '',
+    processStatus: '',
+    deptId: '',
+    manufacturerId: '',
+    position: '',
+    begTime: '',
+    endTime: '',
+    devCode: '',
+  }
+  fetchData()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
@@ -175,35 +116,50 @@
     return
   }
   tableFlag.value = type
-  tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+  // tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+  tableHeight.value = window.innerHeight - 60 - 50 - 98 - 20
 }
 watch(() => list1.value, () => {
   if (list1.value.length) {
-    tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+    // tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+    tableHeight.value = window.innerHeight - 60 - 50 - 98 - 20
   }
 })
 window.addEventListener('resize', () => {
-  tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+  // tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+  tableHeight.value = window.innerHeight - 60 - 50 - 98 - 20
 })
 // 查看报警
 const mapRef = ref()
-const detail = (row: any) => {
+const mapData = ref({})
+const detail = async (row: any) => {
+  const res = await deviceAlarmView(row.id)
+  const data = toHumpObject(res.data)
+  data.lngGaode = '116.30981'
+  data.latGaode = '38.10923'
+  mapData.value = row
   switchMode('map')
   // 绘制点
   const draw = () => {
-    mapRef.value.mapRef.map.setCenter([row.lng, row.lat])
     mapRef.value.mapRef.removeMarker()
     mapRef.value.mapRef.addMarker({
-      position: [row.lng, row.lat],
-      content: '',
+      position: [data.lngGaode, data.latGaode],
+      content: '<div class="spread-circle"></div>',
       label: '',
     })
+    mapRef.value.mapRef.map.setFitView()
+    mapRef.value.mapRef.map.setZoom(15)
+    mapRef.value.openInfoDetail({
+      ...row,
+      lnglat: [data.lngGaode, data.latGaode],
+    })
   }
   setTimeout(() => {
-    if (!row.lng || !row.lat) {
+    if (!data.lngGaode || !data.latGaode) {
       ElMessage.warning('该数据缺少坐标信息')
       return
     }
+    // 已读
     if (mapRef.value.completeFlag) {
       draw()
     }
@@ -212,11 +168,70 @@
         draw()
       }, 1000)
     }
-    // console.log(mapRef.value)
-    // lat: '39.901552',
-    // lng: '116.398043',
   })
 }
+// 批量删除
+const { proxy } = getCurrentInstance() as any
+// 多选
+const multipleTable = ref([])
+const handleSelectionChange = (val: any) => {
+  console.log(val, '多选数据')
+  multipleTable.value = val
+}
+// 批量删除
+const batchDeleteRow = () => {
+  if (!multipleTable.value.length) {
+    ElMessage.warning('请先选中数据')
+    return
+  }
+  ElMessageBox.confirm(
+    '确定要删除选中的数据吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    batchRemoveRow(multipleTable.value.map((item: any) => item.id)).then(() => {
+      ElMessage.success('操作成功')
+      multipleTable.value = []
+      fetchData()
+    })
+  })
+}
+// 字典
+const fetchDict = () => {
+  // 报警类型
+  getAlarmTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
+    alarmTypeList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({
+      name: item.alarmType,
+      value: item.id,
+      id: item.id,
+    })), 'name')
+  })
+  // 设备类型
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
+    deviceTypeList.value = res.data.rows.map((item: any) => ({
+      name: item.typeName,
+      value: item.id,
+      id: item.id,
+    }))
+  })
+  // 厂商列表
+  getManufacturerListPage().then((res) => {
+    manufacturerList.value = res.data.rows.map((item: any) => ({
+      name: item.name || '',
+      id: item.id,
+      value: item.id,
+    }))
+  })
+  // 报警状态
+  getDictByCode('alarmStatus').then((res) => {
+    alarmStatusList.value = res.data
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -225,28 +240,39 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
+        <el-select v-model="listQuery.alarmTypeId" placeholder="报警类型" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in alarmTypeList" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
+        <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
+        <el-select v-model="listQuery.processStatus" placeholder="报警状态" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in alarmStatusList" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
       </search-item>
       <search-item>
         <dept-select
-          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select"
+          v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" class="select"
           style="width: 192px;"
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="厂商" clearable class="select" style="width: 192px;" />
+        <el-select
+          v-model="listQuery.manufacturerId" placeholder="厂商" clearable filterable class="select"
+          style="width: 192px;"
+        >
+          <el-option v-for="item in manufacturerList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
+        <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
+        <el-input v-model.trim="listQuery.devCode" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
         <el-date-picker
@@ -269,6 +295,9 @@
           <template #btns-right>
             <!-- 操作 -->
             <div>
+              <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
+                批量删除
+              </el-button>
               <el-button type="primary">
                 导出
               </el-button>
@@ -277,7 +306,10 @@
           <!-- 查询结果Table显示 -->
           <normal-table
             :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" @change="changePage"
+            :list-loading="loadingTable" :height="tableHeight - 50 - 70"
+            :is-multi="proxy.hasPerm('/alarm/device/delete')"
+            :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
+            @multiSelect="handleSelectionChange"
           >
             <template #preColumns>
               <el-table-column label="序号" width="55" align="center">
@@ -314,7 +346,7 @@
       </div>
       <!-- 地图 -->
       <div v-if="tableFlag === 'map'" :style="`height: ${tableHeight}px`" class="map">
-        <map-com ref="mapRef" :height="tableHeight" />
+        <map-com ref="mapRef" :height="tableHeight - 10" :data="mapData" />
       </div>
     </div>
   </app-container>
@@ -376,4 +408,11 @@
 .select {
   width: 192px !important;
 }
+
+.spread-circle {
+  width: 25px;
+  height: 25px;
+  border-radius: 50%;
+  background: url("@/assets/images/spread.gif") no-repeat center center / cover;
+}
 </style>
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index bc9ae81..b01f27c 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -4,22 +4,32 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="HistoryAlarm">
+import dayjs from 'dayjs'
 import { shortcuts } from '@/utils/common'
+import { getDictByCode } from '@/api/system/dict'
+import { getDeviceHistoryListPage } from '@/api/home/operation/history'
+import { getManufacturerListPage } from '@/api/home/device/product'
+import { uniqueMultiArray } from '@/utils/Array'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getAlarmTypeListPage } from '@/api/home/rule/alarm'
+const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+const manufacturerList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
 // 表格数据
 const list = ref([])
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '设备编号', value: '', align: 'center' },
-  { text: '报警类型', value: '', align: 'center' },
-  { text: '报警原因', value: '', align: 'center' },
-  { text: '厂商', value: '', align: 'center' },
-  { text: '设备类型', value: '', align: 'center' },
-  { text: '位置', value: '', align: 'center' },
-  { text: '管理单位', value: '', align: 'center' },
-  { text: '报警时间', value: '', align: 'center' },
-  { text: '解除时间', value: '', align: 'center' },
-  { text: '解除时长', value: '', align: 'center' },
+  { text: '设备编号', value: 'devCode', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center' },
+  { text: '报警原因', value: 'alarmContent', align: 'center' },
+  { text: '厂商', value: 'manufactureName', align: 'center' },
+  { text: '设备类型', value: 'devTypeName', align: 'center' },
+  { text: '位置', value: 'position', align: 'center' },
+  { text: '管理单位', value: 'deptName', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '110' },
+  { text: '解除时间', value: 'cancelTime', align: 'center', width: '190' },
+  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '190' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -32,28 +42,53 @@
 const listQuery = ref({
   limit: 20,
   offset: 1,
+  alarmTypeId: '',
+  devTypeId: '',
+  deptId: '',
+  manufacturerId: '',
+  position: '',
+  devCode: '',
+  begTime: '',
+  endTime: '',
 })
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  // listQuery.createTimeStart = ''
-  // listQuery.createTimeEnd = ''
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      // listQuery.createTimeStart = `${newVal[0]} 00:00:00`
-      // listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+      listQuery.value.begTime = `${newVal[0]} 00:00:00`
+      listQuery.value.endTime = `${newVal[1]} 23:59:59`
     }
   }
 })
 // 查询数据
 const fetchData = () => {
-  setTimeout(() => {
+  loadingTable.value = true
+  getDeviceHistoryListPage(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    loadingTable.value = false
+  }).catch(() => {
     loadingTable.value = false
   })
 }
 // 重置查询条件f
 const reset = () => {
-
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+    alarmTypeId: '',
+    devTypeId: '',
+    deptId: '',
+    manufacturerId: '',
+    position: '',
+    devCode: '',
+    begTime: '',
+    endTime: '',
+  }
+  fetchData()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
@@ -65,9 +100,50 @@
   }
   fetchData()
 }
-
+// 查看
+const $router = useRouter()
+const detailRow = (row: any) => {
+  $router.push({
+    name: 'operationHistoryDetail',
+    query: {
+      id: row.id,
+      type: 'history',
+    },
+  })
+}
+// 字典
+const fetchDict = () => {
+  // 报警类型
+  getAlarmTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
+    alarmTypeList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({
+      name: item.alarmType,
+      value: item.id,
+      id: item.id,
+    })), 'name')
+  })
+  // 设备类型
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
+    deviceTypeList.value = res.data.rows.map((item: any) => ({
+      name: item.typeName,
+      value: item.id,
+      id: item.id,
+    }))
+  })
+  // 厂商列表
+  getManufacturerListPage().then((res) => {
+    manufacturerList.value = res.data.rows.map((item: any) => ({
+      name: item.name || '',
+      id: item.id,
+      value: item.id,
+    }))
+  })
+}
+fetchDict()
 onMounted(() => {
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 </script>
 
@@ -77,25 +153,37 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
+        <el-select v-model="listQuery.alarmTypeId" placeholder="报警类型" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in alarmTypeList" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
+        <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
+      </search-item> -->
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" class="select"
+          style="width: 192px;"
+        />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
+        <el-select
+          v-model="listQuery.manufacturerId" placeholder="厂商" clearable filterable class="select"
+          style="width: 192px;"
+        >
+          <el-option v-for="item in manufacturerList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="厂商" clearable class="select" style="width: 192px;" />
+        <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
+        <el-input v-model.trim="listQuery.devCode" placeholder="设备编号" clearable />
       </search-item>
 
       <search-item>
@@ -139,7 +227,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detail(scope.row)">
+              <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
               </el-button>
             </template>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index 2e6c2a5..fd41cd3 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -73,7 +73,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.protocolName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',

diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts
new file mode 100644
index 0000000..2723ec8
--- /dev/null
+++ b/src/api/home/operation/alarm.ts
@@ -0,0 +1,41 @@
+/**
+ * 设备当前报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceCurrentListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查看
+export function deviceAlarmView(id: any) {
+  return request({
+    url: '/maintenance/alarmRecords/deviceAlarmView',
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+// 挂起
+export function pendingDeviceAlarm(data: any) {
+  return request({
+    url: '/maintenance/alarmRecords/suspend',
+    method: 'post',
+    data,
+  })
+}
+// 批量删除
+export function batchRemoveRow(ids: any) {
+  return request({
+    url: '/maintenance/alarmRecords/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts
new file mode 100644
index 0000000..a26ad3f
--- /dev/null
+++ b/src/api/home/operation/history.ts
@@ -0,0 +1,14 @@
+/**
+ * 设备历史报警
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getDeviceHistoryListPage(data: any) {
+  return request({
+    url: `/maintenance/alarmRecords/historyListPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index ed722fb..6f58857 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -355,6 +355,19 @@
         },
       },
       {
+        path: 'alarm/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationAlarmDetail',
+        meta: {
+          title: '设备报警详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/alarm',
+          auth: '/operation/alarm',
+        },
+      },
+      {
         path: 'history',
         component: () => import('@/views/home/operation/history/index.vue'),
         name: 'operationHistory',
@@ -368,6 +381,19 @@
         },
       },
       {
+        path: 'history/detail',
+        component: () => import('@/views/home/operation/alarm/components/detail.vue'),
+        name: 'operationHistoryDetail',
+        meta: {
+          title: '历史设备报警',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/operation/history',
+          auth: '/operation/history',
+        },
+      },
+      {
         path: 'trajectory',
         component: () => import('@/views/home/operation/trajectory/index.vue'),
         name: 'operationTrajectory',
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 7ac6332..30aa05e 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -9,6 +9,7 @@
 import monitorDataDialog from './monitorDataDialog.vue'
 import processDialog from './processDialog.vue'
 import { detailAlarm } from '@/api/home/alarm/current'
+import { deviceAlarmView } from '@/api/home/operation/alarm'
 import { toHumpObject } from '@/utils/String'
 const dialogFormVisible = ref(false)
 const overlay = ref()
@@ -32,15 +33,20 @@
   processContent: '',
   processStatus: '',
   id: '',
+  type: '',
 })
+const type = ref('')
 const initDialog = (e: any) => {
   console.log(e, '信息窗体接收的数据')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   dialogFormVisible.value = true
-  info.value = e.info
-  detailAlarm(e.info.id).then((res) => {
+  type.value = e.type
+  info.value = e.info;
+
+  (type.value === 'data' ? detailAlarm : deviceAlarmView)(e.info.id).then((res) => {
     info.value = toHumpObject(res.data) as any
+    console.log(info.value, 'info.value')
   })
 }
 
@@ -53,13 +59,26 @@
 const $router = useRouter()
 const moreData = () => {
   $router.push({
-    name: 'AlarmCurrentDetail',
+    name: type.value === 'data' ? 'AlarmCurrentDetail' : 'operationAlarmDetail',
     query: {
       id: info.value.id,
       row: JSON.stringify(info.value),
     },
   })
 }
+// 设备详情
+const goDevice = () => {
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
 // 提醒责任人
 const remindRef = ref()
 const remind = () => {
@@ -68,13 +87,18 @@
 // 挂起
 const pendingRef = ref()
 const pending = () => {
-  pendingRef.value.initDialog(info.value)
+  pendingRef.value.initDialog({ ...info.value, type: type.value })
 }
 // 查看流程
 const processRef = ref()
 const viewProcess = () => {
   processRef.value.initDialog(info.value)
 }
+// 报警处置
+const handlerRef = ref()
+const handler = () => {
+  handlerRef.value.initDialog(info.value)
+}
 defineExpose({ initDialog, close })
 </script>
 
@@ -94,7 +118,13 @@
       <span class="more" @click="moreData">>>更多</span>
     </div>
     <div class="content">
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备编号:
+        <span style="padding-left: 6px;" class="more" @click="goDevice">
+          {{ info.devcode }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警类别:
         <span style="padding-left: 6px;">
           {{ info.alarmCategory }}
@@ -106,7 +136,13 @@
           {{ info.alarmMsg }}
         </span>
       </div>
-      <div class="item">
+      <div v-show="type === 'device'" class="item">
+        设备类型:
+        <span style="padding-left: 6px;">
+          {{ info.devTypeName }}
+        </span>
+      </div>
+      <div v-show="type === 'data'" class="item">
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
@@ -164,7 +200,7 @@
         <span style="padding-left: 6px;">
           {{ info.confirmContent }}
         </span>
-        <el-button size="small" style="padding-left: 6px;" @click="viewProcess">
+        <el-button v-if="type === 'data'" size="small" style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
       </div>
@@ -176,9 +212,12 @@
       </div>
     </div>
     <div class="footer">
-      <el-button v-if="Number(info.processStatus) < 4" size="small" @click="remind">
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'data'" size="small" @click="remind">
         提醒责任人
       </el-button>
+      <el-button v-if="Number(info.processStatus) < 4 && type === 'device'" size="small" @click="handler">
+        报警处置
+      </el-button>
       <el-button v-if="Number(info.processStatus) <= 3" type="primary" size="small" @click="pending">
         挂起
       </el-button>
@@ -233,14 +272,14 @@
     display: flex;
     justify-content: space-between;
     font-size: 16px;
+  }
 
-    .more {
-      color: #3d7eff;
+  .more {
+    color: #3d7eff;
 
-      &:hover {
-        cursor: pointer;
-        text-decoration: underline;
-      }
+    &:hover {
+      cursor: pointer;
+      text-decoration: underline;
     }
   }
 
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index 6e1b260..a8b44a6 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -46,6 +46,7 @@
     infoWindow: detail.value,
     info: $props.data,
     map: mapRef.value.map,
+    type: 'data',
   })
   setTimeout(() => {
     // mapRef.value.map.setFitView()
@@ -75,6 +76,7 @@
       infoWindow: detail.value,
       info: data,
       map: mapRef.value.map,
+      type: 'data',
     })
     setTimeout(() => {
       // mapRef.value.map.setFitView()
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index df1cd85..dcac82c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -7,6 +7,7 @@
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { pendingAlarm } from '@/api/home/alarm/current'
+import { pendingDeviceAlarm } from '@/api/home/operation/alarm'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -30,11 +31,13 @@
 
 // 初始化对话框
 const data = ref()
+const type = ref('')
 const initDialog = (row: any) => {
   data.value = row
   dialogFormVisible.value = true
   resetForm()
   dataForm.value.alarmId = row.id
+  type.value = row.type
 }
 defineExpose({
   initDialog,
@@ -44,7 +47,7 @@
 const saveData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      pendingAlarm(dataForm.value).then((res) => {
+      (type.value === 'data' ? pendingAlarm : pendingDeviceAlarm)(dataForm.value).then((res) => {
         ElMessage.success('操作成功')
         dialogFormVisible.value = false
         data.value.processStatus = 3
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index c65a637..b6fcb2d 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -7,12 +7,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-import { batchDelete, getCurrentAlarmListPage, viewAlarm } from '@/api/home/alarm/current'
+import { batchDelete, detailAlarm, getCurrentAlarmListPage } from '@/api/home/alarm/current'
 import { getDictByCode } from '@/api/system/dict'
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
 import { shortcuts } from '@/utils/common'
+import { toHumpObject } from '@/utils/String'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -138,16 +139,16 @@
 // 查看报警
 const mapRef = ref()
 const mapData = ref({})
-const detail = (row: any) => {
+const detail = async (row: any) => {
+  const res = await detailAlarm(row.id)
+  const data = toHumpObject(res.data)
   mapData.value = row
   switchMode('map')
-  row.lngGaode = '116.398043'
-  row.latGaode = '39.901552'
   // 绘制点
   const draw = () => {
     mapRef.value.mapRef.removeMarker()
     mapRef.value.mapRef.addMarker({
-      position: [row.lngGaode, row.latGaode],
+      position: [data.lngGaode, data.latGaode],
       content: '<div class="spread-circle"></div>',
       label: '',
     })
@@ -155,11 +156,11 @@
     mapRef.value.mapRef.map.setZoom(15)
     mapRef.value.openInfoDetail({
       ...row,
-      lnglat: [row.lngGaode, row.latGaode],
+      lnglat: [data.lngGaode, data.latGaode],
     })
   }
   setTimeout(() => {
-    if (!row.lngGaode || !row.latGaode) {
+    if (!data.lngGaode || !data.latGaode) {
       ElMessage.warning('该数据缺少坐标信息')
       return
     }
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index 3247ac8..1abcb64 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -8,7 +8,7 @@
 import detailData from './detailData.vue'
 import showPosition from './showPosition.vue'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
-import { getDeviceDetail } from '@/api/home/device/device'
+import { getDeviceListPage } from '@/api/home/device/device'
 const $router = useRouter()
 const $route = useRoute()
 // 页面详情数据
@@ -77,12 +77,17 @@
 // 获取闸井详情数据
 const fetchWellDetail = () => {
   loading.value = true
-  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
-    loading.value = false
-    detailInfo.value = JSON.parse($route.query.row as string)
-    detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
-    detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || ''
-    loading.value = false
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+    }
+    catch (err) {
+      loading.value = false
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 2b228a0..0b75fd4 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -131,7 +131,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.deviceName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 52e035f..799fc90 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -81,7 +81,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.productName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 7df5933..59f1343 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -75,7 +75,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.typeName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index d56a41c..91ad1ca 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -90,7 +90,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.pipeCode}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 688e419..54a3218 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -81,7 +81,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.name}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
new file mode 100644
index 0000000..849f2ee
--- /dev/null
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -0,0 +1,263 @@
+<!--
+  Description: 设备报警-详情
+  Author: 李亚光
+  Date: 2023-09-14
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import { alarmProcessNode } from '@/api/home/alarm/current'
+import { getAlarmDetail } from '@/api/home/alarm/history'
+import { deviceAlarmView } from '@/api/home/operation/alarm'
+import { toHumpObject } from '@/utils/String'
+import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
+import { getDateDiff } from '@/utils/dayjs'
+import showPosition from '@/views/home/device/device/components/showPosition.vue'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'devTypeName',
+    align: 'center',
+  },
+
+  {
+    text: '报警编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '报警类别',
+    value: 'alarmCategory',
+    align: 'center',
+  },
+  {
+    text: '报警类型',
+    value: 'alarmTypeName',
+    align: 'center',
+  },
+  {
+    text: '报警原因',
+    value: 'alarmMsg',
+    align: 'center',
+  },
+  {
+    text: '报警等级',
+    value: 'alarmLevelName',
+    align: 'center',
+  },
+  {
+    text: '报警时间',
+    value: $route.query.type === 'history' ? 'alarmTime' : 'ts',
+    align: 'center',
+  },
+  {
+    text: '位置',
+    value: 'ledgerNumber',
+    align: 'center',
+  },
+  {
+    text: '详细地址',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '负责人',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '是否误报',
+    value: 'realAlarmName',
+    align: 'center',
+  },
+  {
+    text: '解除时间',
+    value: 'cancelTime',
+    align: 'center',
+  },
+  {
+    text: '处置时长',
+    value: $route.query.type === 'history' ? 'cancelDuration' : 'duration',
+    align: 'center',
+  },
+  {
+    text: '',
+    value: '',
+    align: '',
+  },
+])
+// 报警动态
+const alarmDynamics = ref<any[]>([])
+// 页面loading
+const loading = ref(false)
+const loadingDynamics = ref(false)
+// 获取闸井详情数据
+const fetchDetail = async () => {
+  loading.value = true
+  const res1 = await getAlarmLevelListPage({ offset: 1, limit: 9999 })
+  const res2 = await getAlarmTypeListPage({ offset: 1, limit: 9999 });
+  ($route.query.type === 'history' ? getAlarmDetail : deviceAlarmView)($route.query.id as string).then((res) => {
+    detailInfo.value = toHumpObject(res.data)
+    detailInfo.value.realAlarmName = detailInfo.value.realAlarm === '1' ? '报警' : '误报'
+    detailInfo.value.alarmTypeName = res2.data.rows.filter((item: any) => item.id === detailInfo.value.alarmTypeId)[0]?.alarmType || ''
+    detailInfo.value.alarmLevelName = res1.data.rows.filter((item: any) => item.id === detailInfo.value.alarmLevel)[0]?.alarmLevel || ''
+    detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
+    console.log(detailInfo.value, 'detailInfo.value')
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+
+  // 获取报警动态
+  loadingDynamics.value = true
+  const info = JSON.parse($route.query.row as string)
+  alarmProcessNode($route.query.id as string).then((res) => {
+    alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
+    alarmDynamics.value.unshift({
+      approvalTime: info.ts, // 报警生成时间
+      process_name: '',
+      approvalPerson: '报警生成',
+      dept_name: '',
+    })
+    loadingDynamics.value = false
+  }).catch(() => {
+    loadingDynamics.value = false
+  })
+}
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  console.log(data, 'data')
+  if (data.text === '位置') {
+    if (detailInfo.value.watchObject && detailInfo.value.devcode && detailInfo.value.ledgerId) {
+      const watchObject = {
+        1: 'WellMonitorDetail',
+        2: 'StationMonitorDetail',
+        3: 'PipelineMonitorDetail',
+      } as { [key: string]: string }
+      $router.push({
+        name: watchObject[detailInfo.value.watchObject],
+        query: {
+          id: detailInfo.value.ledgerId,
+          deviceCode: detailInfo.value.devcode,
+          typeName: detailInfo.value.devTypeName,
+          row: JSON.stringify({
+            id: detailInfo.value.ledgerId,
+            typeName: detailInfo.value.devTypeName,
+            deviceCode: detailInfo.value.devcode,
+          }),
+        },
+      })
+      // $router
+    }
+    return
+  }
+  if (data.text !== '详细地址' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lngGaode || !detailInfo.value.latGaode) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lngGaode, detailInfo.value.latGaode])
+}
+onMounted(() => {
+  fetchDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <show-position ref="mapRef" />
+    <detail-page title="报警详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span
+            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' ? 'pointer link' : ''}`"
+            @click="showMap(item)"
+          >
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+        <el-descriptions-item v-loading="loadingDynamics" align="left" label-align="center">
+          <template #label>
+            <span class="label">
+              报警动态
+            </span>
+          </template>
+          <div style="padding: 25px;">
+            <el-timeline>
+              <el-timeline-item
+                v-for="(item, index) in alarmDynamics" :key="index" :timestamp="item.approvalTime"
+                type="primary"
+              >
+                {{ `${item.approvalPerson}${item.dept_name ? '(' : ''}${item.dept_name}${item.dept_name ? ')'
+                  : ''}${item.process_name}` }}
+              </el-timeline-item>
+            </el-timeline>
+          </div>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
+.link {
+  color: #3d7eff;
+
+  &:hover {
+    text-decoration: underline;
+  }
+}
+
+.bottom {
+  --el-descriptions-table-border-top: none;
+
+  ::v-deep(.el-descriptions) {
+    --el-descriptions-table-border-top: none;
+  }
+}
+</style>
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index 30f312e..0d10efa 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -4,13 +4,19 @@
   Date: 2023-07-08
  -->
 <script lang="ts" setup name="AlarmMap">
+import detailInfo from '@/views/home/alarm/current/components/detailInfoDialog.vue'
 import AMap from '@/components/map/index.vue'
 const $props = defineProps({
   height: {
     type: Number,
     default: 0,
   },
+  data: {
+    type: Object,
+    default: () => ({}),
+  },
 })
+
 // 地图实例
 const mapRef = ref()
 // 地图加载状态
@@ -20,15 +26,80 @@
   completeFlag.value = true
   console.log('地图加载完成')
 }
+// 点标记弹窗
+const detail = ref()
+const detailRef = ref()
+const markerClick = (data: any) => {
+  // 定义弹窗
+  detail.value = new mapRef.value.AMap.InfoWindow({
+    closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体
+    autoMove: true, // 是否自动调整窗体到视野内
+    isCustom: true, // 自定义信息窗体
+    content: detailRef.value.$el, // 窗体内容(vue组件)
+    offset: new mapRef.value.AMap.Pixel(9, -5), // 偏移
+  })
+  // 打开信息窗口
+  detail.value.open(data.map, data.data.position)
+  // 初始化信息窗口
+  detailRef.value.initDialog({
+    overlay: data.event.target,
+    infoWindow: detail.value,
+    info: $props.data,
+    map: mapRef.value.map,
+    type: 'device',
+  })
+  setTimeout(() => {
+    // mapRef.value.map.setFitView()
+    // mapRef.value.map.setCenter(data.data.position)
+    const center = JSON.parse(JSON.stringify(data.data.position))
+    center[1] = Number(center[1]) + 0.0035
+    mapRef.value.map.setCenter(center)
+  })
+}
+
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  // mapRef.value.map.setZoom(10.5)
+  // 定义弹窗
+  detail.value = new mapRef.value.AMap.InfoWindow({
+    closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体
+    autoMove: true, // 是否自动调整窗体到视野内
+    isCustom: true, // 自定义信息窗体
+    content: detailRef.value.$el, // 窗体内容(vue组件)
+    offset: new mapRef.value.AMap.Pixel(9, -5), // 偏移
+  })
+  // 打开信息窗口
+  setTimeout(() => {
+    detail.value.open(mapRef.value.map, data.lnglat)
+    // 初始化信息窗口
+    detailRef.value.initDialog({
+      infoWindow: detail.value,
+      info: data,
+      map: mapRef.value.map,
+      type: 'device',
+    })
+    setTimeout(() => {
+      // mapRef.value.map.setFitView()
+      const center = JSON.parse(JSON.stringify(data.lnglat))
+      center[1] = Number(center[1]) + 0.0035
+      mapRef.value.map.setCenter(center)
+    })
+    // mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+
 defineExpose({
   mapRef,
   completeFlag,
+  openInfoDetail,
 })
 </script>
 
 <template>
   <div :style="`height: ${$props.height}px`" class="map-container">
-    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
+    <!-- 设备信息窗体 -->
+    <detail-info ref="detailRef" />
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" @markerClick="markerClick" />
   </div>
 </template>
 
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index 7527f72..1688e59 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -4,20 +4,32 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="CurrentAlarm">
-import { ElMessage } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
 import { shortcuts } from '@/utils/common'
+import { getDictByCode } from '@/api/system/dict'
+import { batchRemoveRow, deviceAlarmView, getDeviceCurrentListPage } from '@/api/home/operation/alarm'
+import { getManufacturerListPage } from '@/api/home/device/product'
+import { uniqueMultiArray } from '@/utils/Array'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getAlarmTypeListPage } from '@/api/home/rule/alarm'
+import { toHumpObject } from '@/utils/String'
+const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+const manufacturerList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+const alarmStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 报警状态
 // 表格数据
 const list1 = ref<any[]>([])
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '设备编号', value: 'devicecode', align: 'center' },
-  { text: '报警类型', value: 'alarmTypeName', align: 'center' },
-  { text: '报警原因', value: 'alarmReason', align: 'center' },
+  { text: '设备编号', value: 'devCode', align: 'center' },
+  { text: '设备类型', value: 'devTypeName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center' },
+  { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '状态', value: 'status', align: 'center', width: '110' },
+  { text: '状态', value: 'processStatus', align: 'center', width: '110' },
   { text: '报警时间', value: 'alarmTime', align: 'center', width: '200' },
 ])
 // 最终展示列
@@ -31,126 +43,55 @@
 const listQuery = ref({
   limit: 20,
   offset: 1,
+  alarmTypeId: '',
+  devTypeId: '',
+  processStatus: '',
+  deptId: '',
+  manufacturerId: '',
+  position: '',
+  begTime: '',
+  endTime: '',
+  devCode: '',
 })
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  // listQuery.createTimeStart = ''
-  // listQuery.createTimeEnd = ''
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      // listQuery.createTimeStart = `${newVal[0]} 00:00:00`
-      // listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+      listQuery.value.begTime = `${newVal[0]} 00:00:00`
+      listQuery.value.endTime = `${newVal[1]} 23:59:59`
     }
   }
 })
 // 查询数据
 const fetchData = () => {
-  setTimeout(() => {
+  loadingTable.value = true
+  getDeviceCurrentListPage(listQuery.value).then((res) => {
+    list1.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
-    list1.value = [
-      {
-        alarmTypeName: '闸井浓度超限',
-        alarmRank: '一级',
-        alarmReason: '燃气浓度23%vol',
-        position: 'N121422南小街中压',
-        deviceType: '燃气智能监测终端',
-        devicecode: '342022010027',
-        deptName: '第一分公司/运维1所/1班',
-        status: '未读',
-        alarmTime: '2024-07-01 12:45:50',
-        lat: '39.91081620470105',
-        lng: '116.2590451793805',
-      },
-      {
-        alarmTypeName: '闸井浓度超限',
-        alarmRank: '二级',
-        alarmReason: '燃气浓度23%vol',
-        position: 'N121422南小街中压',
-        deviceType: '燃气智能监测终端',
-        devicecode: '342022010027',
-        deptName: '第一分公司/运维1所/1班',
-        status: '未读',
-        alarmTime: '',
-        lat: '39.911268',
-        lng: '116.343489',
-      },
-      {
-        alarmTypeName: '疑似第三方破坏',
-        alarmRank: '一级',
-        alarmReason: '桩倾斜报警',
-        position: 'N121422南小街中压',
-        deviceType: '智能监测桩',
-        devicecode: '342022010027',
-        deptName: '第一分公司/运维1所/1班',
-        status: '已确认',
-        alarmTime: '',
-        lat: '39.943322',
-        lng: '116.403976',
-      },
-      {
-        alarmTypeName: '设备故障',
-        alarmRank: '三级',
-        alarmReason: '传感器异常',
-        position: '422南小街中压',
-        deviceType: '管线哨兵',
-        deviceNo: '342022010027',
-        deptName: '第一分公司/运维1所/1班',
-        status: '挂起',
-        alarmTime: '',
-        lat: '39.901552',
-        lng: '116.398043',
-      },
-      {
-        alarmTypeName: '设备故障',
-        alarmRank: '三级',
-        alarmReason: '传感器异常',
-        position: '422南小街中压',
-        deviceType: '管线哨兵',
-        devicecode: '342022010027',
-        deptName: '第一分公司/运维1所/1班',
-        status: '挂起',
-        alarmTime: '',
-      },
-      {
-        alarmTypeName: '设备故障',
-        alarmRank: '三级',
-        alarmReason: '传感器异常',
-        position: '422南小街中压',
-        deviceType: '管线哨兵',
-        devicecode: '342022010027',
-        deptName: '第一分公司/运维1所/1班',
-        status: '挂起',
-        alarmTime: '',
-      },
-      {
-        alarmTypeName: '设备故障',
-        alarmRank: '三级',
-        alarmReason: '传感器异常',
-        position: '422南小街中压',
-        deviceType: '管线哨兵',
-        devicecode: '342022010027',
-        dept: '第一分公司/运维1所/1班',
-        status: '挂起',
-        alarmTime: '',
-      },
-      {
-        alarmTypeName: '设备故障',
-        alarmRank: '三级',
-        alarmReason: '传感器异常',
-        position: '422南小街中压',
-        deviceType: '管线哨兵',
-        deviceNo: '342022010027',
-        dept: '第一分公司/运维1所/1班',
-        status: '挂起',
-        alarmTime: '',
-      },
-    ] as any[]
-  }, 1000)
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 // 重置查询条件f
 const reset = () => {
-
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+    alarmTypeId: '',
+    devTypeId: '',
+    processStatus: '',
+    deptId: '',
+    manufacturerId: '',
+    position: '',
+    begTime: '',
+    endTime: '',
+    devCode: '',
+  }
+  fetchData()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
@@ -175,35 +116,50 @@
     return
   }
   tableFlag.value = type
-  tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+  // tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+  tableHeight.value = window.innerHeight - 60 - 50 - 98 - 20
 }
 watch(() => list1.value, () => {
   if (list1.value.length) {
-    tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+    // tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+    tableHeight.value = window.innerHeight - 60 - 50 - 98 - 20
   }
 })
 window.addEventListener('resize', () => {
-  tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+  // tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+  tableHeight.value = window.innerHeight - 60 - 50 - 98 - 20
 })
 // 查看报警
 const mapRef = ref()
-const detail = (row: any) => {
+const mapData = ref({})
+const detail = async (row: any) => {
+  const res = await deviceAlarmView(row.id)
+  const data = toHumpObject(res.data)
+  data.lngGaode = '116.30981'
+  data.latGaode = '38.10923'
+  mapData.value = row
   switchMode('map')
   // 绘制点
   const draw = () => {
-    mapRef.value.mapRef.map.setCenter([row.lng, row.lat])
     mapRef.value.mapRef.removeMarker()
     mapRef.value.mapRef.addMarker({
-      position: [row.lng, row.lat],
-      content: '',
+      position: [data.lngGaode, data.latGaode],
+      content: '<div class="spread-circle"></div>',
       label: '',
     })
+    mapRef.value.mapRef.map.setFitView()
+    mapRef.value.mapRef.map.setZoom(15)
+    mapRef.value.openInfoDetail({
+      ...row,
+      lnglat: [data.lngGaode, data.latGaode],
+    })
   }
   setTimeout(() => {
-    if (!row.lng || !row.lat) {
+    if (!data.lngGaode || !data.latGaode) {
       ElMessage.warning('该数据缺少坐标信息')
       return
     }
+    // 已读
     if (mapRef.value.completeFlag) {
       draw()
     }
@@ -212,11 +168,70 @@
         draw()
       }, 1000)
     }
-    // console.log(mapRef.value)
-    // lat: '39.901552',
-    // lng: '116.398043',
   })
 }
+// 批量删除
+const { proxy } = getCurrentInstance() as any
+// 多选
+const multipleTable = ref([])
+const handleSelectionChange = (val: any) => {
+  console.log(val, '多选数据')
+  multipleTable.value = val
+}
+// 批量删除
+const batchDeleteRow = () => {
+  if (!multipleTable.value.length) {
+    ElMessage.warning('请先选中数据')
+    return
+  }
+  ElMessageBox.confirm(
+    '确定要删除选中的数据吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    batchRemoveRow(multipleTable.value.map((item: any) => item.id)).then(() => {
+      ElMessage.success('操作成功')
+      multipleTable.value = []
+      fetchData()
+    })
+  })
+}
+// 字典
+const fetchDict = () => {
+  // 报警类型
+  getAlarmTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
+    alarmTypeList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({
+      name: item.alarmType,
+      value: item.id,
+      id: item.id,
+    })), 'name')
+  })
+  // 设备类型
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
+    deviceTypeList.value = res.data.rows.map((item: any) => ({
+      name: item.typeName,
+      value: item.id,
+      id: item.id,
+    }))
+  })
+  // 厂商列表
+  getManufacturerListPage().then((res) => {
+    manufacturerList.value = res.data.rows.map((item: any) => ({
+      name: item.name || '',
+      id: item.id,
+      value: item.id,
+    }))
+  })
+  // 报警状态
+  getDictByCode('alarmStatus').then((res) => {
+    alarmStatusList.value = res.data
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -225,28 +240,39 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
+        <el-select v-model="listQuery.alarmTypeId" placeholder="报警类型" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in alarmTypeList" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
+        <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
+        <el-select v-model="listQuery.processStatus" placeholder="报警状态" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in alarmStatusList" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
       </search-item>
       <search-item>
         <dept-select
-          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select"
+          v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" class="select"
           style="width: 192px;"
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="厂商" clearable class="select" style="width: 192px;" />
+        <el-select
+          v-model="listQuery.manufacturerId" placeholder="厂商" clearable filterable class="select"
+          style="width: 192px;"
+        >
+          <el-option v-for="item in manufacturerList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
+        <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
+        <el-input v-model.trim="listQuery.devCode" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
         <el-date-picker
@@ -269,6 +295,9 @@
           <template #btns-right>
             <!-- 操作 -->
             <div>
+              <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
+                批量删除
+              </el-button>
               <el-button type="primary">
                 导出
               </el-button>
@@ -277,7 +306,10 @@
           <!-- 查询结果Table显示 -->
           <normal-table
             :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" @change="changePage"
+            :list-loading="loadingTable" :height="tableHeight - 50 - 70"
+            :is-multi="proxy.hasPerm('/alarm/device/delete')"
+            :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
+            @multiSelect="handleSelectionChange"
           >
             <template #preColumns>
               <el-table-column label="序号" width="55" align="center">
@@ -314,7 +346,7 @@
       </div>
       <!-- 地图 -->
       <div v-if="tableFlag === 'map'" :style="`height: ${tableHeight}px`" class="map">
-        <map-com ref="mapRef" :height="tableHeight" />
+        <map-com ref="mapRef" :height="tableHeight - 10" :data="mapData" />
       </div>
     </div>
   </app-container>
@@ -376,4 +408,11 @@
 .select {
   width: 192px !important;
 }
+
+.spread-circle {
+  width: 25px;
+  height: 25px;
+  border-radius: 50%;
+  background: url("@/assets/images/spread.gif") no-repeat center center / cover;
+}
 </style>
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index bc9ae81..b01f27c 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -4,22 +4,32 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="HistoryAlarm">
+import dayjs from 'dayjs'
 import { shortcuts } from '@/utils/common'
+import { getDictByCode } from '@/api/system/dict'
+import { getDeviceHistoryListPage } from '@/api/home/operation/history'
+import { getManufacturerListPage } from '@/api/home/device/product'
+import { uniqueMultiArray } from '@/utils/Array'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getAlarmTypeListPage } from '@/api/home/rule/alarm'
+const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+const manufacturerList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
 // 表格数据
 const list = ref([])
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '设备编号', value: '', align: 'center' },
-  { text: '报警类型', value: '', align: 'center' },
-  { text: '报警原因', value: '', align: 'center' },
-  { text: '厂商', value: '', align: 'center' },
-  { text: '设备类型', value: '', align: 'center' },
-  { text: '位置', value: '', align: 'center' },
-  { text: '管理单位', value: '', align: 'center' },
-  { text: '报警时间', value: '', align: 'center' },
-  { text: '解除时间', value: '', align: 'center' },
-  { text: '解除时长', value: '', align: 'center' },
+  { text: '设备编号', value: 'devCode', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center' },
+  { text: '报警原因', value: 'alarmContent', align: 'center' },
+  { text: '厂商', value: 'manufactureName', align: 'center' },
+  { text: '设备类型', value: 'devTypeName', align: 'center' },
+  { text: '位置', value: 'position', align: 'center' },
+  { text: '管理单位', value: 'deptName', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '110' },
+  { text: '解除时间', value: 'cancelTime', align: 'center', width: '190' },
+  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '190' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -32,28 +42,53 @@
 const listQuery = ref({
   limit: 20,
   offset: 1,
+  alarmTypeId: '',
+  devTypeId: '',
+  deptId: '',
+  manufacturerId: '',
+  position: '',
+  devCode: '',
+  begTime: '',
+  endTime: '',
 })
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  // listQuery.createTimeStart = ''
-  // listQuery.createTimeEnd = ''
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      // listQuery.createTimeStart = `${newVal[0]} 00:00:00`
-      // listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+      listQuery.value.begTime = `${newVal[0]} 00:00:00`
+      listQuery.value.endTime = `${newVal[1]} 23:59:59`
     }
   }
 })
 // 查询数据
 const fetchData = () => {
-  setTimeout(() => {
+  loadingTable.value = true
+  getDeviceHistoryListPage(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    loadingTable.value = false
+  }).catch(() => {
     loadingTable.value = false
   })
 }
 // 重置查询条件f
 const reset = () => {
-
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+    alarmTypeId: '',
+    devTypeId: '',
+    deptId: '',
+    manufacturerId: '',
+    position: '',
+    devCode: '',
+    begTime: '',
+    endTime: '',
+  }
+  fetchData()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
@@ -65,9 +100,50 @@
   }
   fetchData()
 }
-
+// 查看
+const $router = useRouter()
+const detailRow = (row: any) => {
+  $router.push({
+    name: 'operationHistoryDetail',
+    query: {
+      id: row.id,
+      type: 'history',
+    },
+  })
+}
+// 字典
+const fetchDict = () => {
+  // 报警类型
+  getAlarmTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
+    alarmTypeList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({
+      name: item.alarmType,
+      value: item.id,
+      id: item.id,
+    })), 'name')
+  })
+  // 设备类型
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
+    deviceTypeList.value = res.data.rows.map((item: any) => ({
+      name: item.typeName,
+      value: item.id,
+      id: item.id,
+    }))
+  })
+  // 厂商列表
+  getManufacturerListPage().then((res) => {
+    manufacturerList.value = res.data.rows.map((item: any) => ({
+      name: item.name || '',
+      id: item.id,
+      value: item.id,
+    }))
+  })
+}
+fetchDict()
 onMounted(() => {
-  fetchData()
+  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  setTimeout(() => {
+    fetchData()
+  })
 })
 </script>
 
@@ -77,25 +153,37 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
+        <el-select v-model="listQuery.alarmTypeId" placeholder="报警类型" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in alarmTypeList" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
+        <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
+      </search-item> -->
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" class="select"
+          style="width: 192px;"
+        />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
+        <el-select
+          v-model="listQuery.manufacturerId" placeholder="厂商" clearable filterable class="select"
+          style="width: 192px;"
+        >
+          <el-option v-for="item in manufacturerList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="厂商" clearable class="select" style="width: 192px;" />
+        <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
+        <el-input v-model.trim="listQuery.devCode" placeholder="设备编号" clearable />
       </search-item>
 
       <search-item>
@@ -139,7 +227,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small" @click="detail(scope.row)">
+              <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
               </el-button>
             </template>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index 2e6c2a5..fd41cd3 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -73,7 +73,7 @@
 // 删除
 const removeRow = (row: any) => {
   ElMessageBox.confirm(
-    `确定要删除${row.protocolName}吗？`,
+    '确定要删除该数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index 6b79e30..caf1557 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -50,9 +50,10 @@
     alarmThreshold: '', // 报警阈值
   }
 }
-
+const isFisrst = ref(true)
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
+  isFisrst.value = true
   dialogStatus.value = dialogStatusValue
   dialogFormVisible.value = true
   if (dialogStatus.value === 'create') { // 如果是新增，清除验证
@@ -67,6 +68,10 @@
       ...JSON.parse(JSON.stringify(row)),
     }
   }
+
+  setTimeout(() => {
+    isFisrst.value = false
+  }, 200)
 }
 defineExpose({
   initDialog,
@@ -207,7 +212,6 @@
 // 监听报警判断方式  获取报警事件下拉
 watch(() => dataForm.value.alarmJudgeMethod, (newVal) => {
   if (newVal) {
-    dataForm.value.alarmThreshold = ''
     if (newVal === '0' && dataForm.value.productId) {
       fetchAlarmEvent(dataForm.value.productId)
     }
@@ -227,7 +231,9 @@
     alarmEventList.value = []
   }
   if (newVal) {
-    dataForm.value.alarmThreshold = ''
+    if (!isFisrst.value) {
+      dataForm.value.alarmThreshold = ''
+    }
   }
 }, {
   deep: true,